themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #276 from Lycaonj/general-devel

Browse source 
General devel
This commit is contained in:
Lucas Nicodemus 2011-08-01 19:04:26 -07:00
commit ff6c5fc028
1 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

19
TShockAPI/DB/RegionManager.cs
View file

@ -1,4 +1,4 @@
/* /*
TShock, a server mod for Terraria TShock, a server mod for Terraria
Copyright (C) 2011 The TShock Team Copyright (C) 2011 The TShock Team
@ -172,11 +172,18 @@ namespace TShockAPI.DB
string[] SplitIDs = MergedIDs.Split(','); string[] SplitIDs = MergedIDs.Split(',');
Region r = new Region(new Rectangle(X1, Y1, width, height), name, Protected != 0, Main.worldID.ToString()); Region r = new Region(new Rectangle(X1, Y1, width, height), name, Protected != 0, Main.worldID.ToString());
try try
{ {
for (int i = 0; i < SplitIDs.Length; i++) for (int i = 0; i < SplitIDs.Length; i++)
{ {
r.AllowedIDs.Add(Convert.ToInt32(SplitIDs[i])); int id;
if (Int32.TryParse(SplitIDs[i], out id)) // if unparsable, it's not an int, so silently skip
r.AllowedIDs.Add(id);
else if (SplitIDs[i] == "") // Split gotcha, can return an empty string with certain conditions
// but we only want to let the user know if it's really a nonparsable integer.
Log.Warn("One of your UserIDs is not a usable integer: " + SplitIDs[i]);
} }
} }
catch (Exception e) catch (Exception e)
@ -219,7 +226,13 @@ namespace TShockAPI.DB
{ {
for (int i = 0; i < SplitIDs.Length; i++) for (int i = 0; i < SplitIDs.Length; i++)
{ {
r.AllowedIDs[i] = Convert.ToInt32(SplitIDs[i]); int id;
if (Int32.TryParse(SplitIDs[i], out id)) // if unparsable, it's not an int, so silently skip
r.AllowedIDs.Add(id);
else if (SplitIDs[i] == "") // Split gotcha, can return an empty string with certain conditions
// but we only want to let the user know if it's really a nonparsable integer.
Log.Warn("UnitTest: One of your UserIDs is not a usable integer: " + SplitIDs[i]);
} }
} }
catch (Exception e) catch (Exception e)