warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

massive branch sync

Browse source
This commit is contained in:
mark 2010-04-25 06:09:43 +00:00
parent 489bbabe93
commit b3e8ec0a08
192 changed files with 1249 additions and 1124 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Server/Utility.cs
View file

@ -148,7 +148,7 @@ namespace Server
public static bool IPMatchCIDR( string cidr, IPAddress ip )
{
if ( ip.AddressFamily == AddressFamily.InterNetworkV6 )
if ( ip == null || ip.AddressFamily == AddressFamily.InterNetworkV6 )
return false; //Just worry about IPv4 for now
@ -522,7 +522,7 @@ namespace Server
#endregion
#region Get[Something]
public static int GetInt32( string intString, int defaultValue )
public static int GetXMLInt32( string intString, int defaultValue )
{
try
{
@ -530,18 +530,15 @@ namespace Server
}
catch
{
try
{
return Convert.ToInt32( intString );
}
catch
{
return defaultValue;
}
int val;
if ( int.TryParse( intString, out val ) )
return val;
return defaultValue;
}
}
public static DateTime GetDateTime( string dateTimeString, DateTime defaultValue )
public static DateTime GetXMLDateTime( string dateTimeString, DateTime defaultValue )
{
try
{
@ -558,7 +555,7 @@ namespace Server
}
}
public static TimeSpan GetTimeSpan( string timeSpanString, TimeSpan defaultValue )
public static TimeSpan GetXMLTimeSpan( string timeSpanString, TimeSpan defaultValue )
{
try
{