From b98614946d83ddba6a99d2d358b364ecc01dba43 Mon Sep 17 00:00:00 2001 From: Lucas Nicodemus Date: Thu, 21 Jul 2011 15:03:15 -0600 Subject: [PATCH] Changed every instance of Main.worldID.ToString() to Main.worldName. You broke backwards compatibility with all other warp and region files by doing that. --- TShockAPI/Commands.cs | 8 ++++---- TShockAPI/DB/GroupManager.cs | 8 ++++---- TShockAPI/DB/RegionManager.cs | 12 ++++++------ TShockAPI/DB/WarpsManager.cs | 4 ++-- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs index 727abaa8..caba5766 100755 --- a/TShockAPI/Commands.cs +++ b/TShockAPI/Commands.cs @@ -1078,7 +1078,7 @@ namespace TShockAPI { args.Player.SendMessage("Name reserved, use a different name", Color.Red); } - else if (TShock.Warps.AddWarp(args.Player.TileX, args.Player.TileY, warpName, Main.worldID.ToString())) + else if (TShock.Warps.AddWarp(args.Player.TileX, args.Player.TileY, warpName, Main.worldName)) { args.Player.SendMessage("Set warp " + warpName, Color.Yellow); } @@ -1122,7 +1122,7 @@ namespace TShockAPI { for (int j = (15 * (page - 1)); j < (15 * page); j++) { - if (Warps[j].WorldWarpID == Main.worldID.ToString()) + if (Warps[j].WorldWarpID == Main.worldName) { if (sb.Length != 0) sb.Append(", "); @@ -1422,7 +1422,7 @@ namespace TShockAPI string regionName = String.Join(" ", args.Parameters.GetRange(1, args.Parameters.Count - 1)); if (TShock.Regions.AddRegion(args.Player.TempArea.X, args.Player.TempArea.Y, args.Player.TempArea.Width, args.Player.TempArea.Height, - regionName, Main.worldID.ToString())) + regionName, Main.worldName)) { args.Player.TempArea = Rectangle.Empty; args.Player.SendMessage("Set region " + regionName, Color.Yellow); @@ -1536,7 +1536,7 @@ namespace TShockAPI { for (int j = (15 * (page - 1)); j < (15 * page); j++) { - if (Regions[j].RegionWorldID == Main.worldID.ToString()) + if (Regions[j].RegionWorldID == Main.worldName) { if (sb.Length != 0) sb.Append(", "); diff --git a/TShockAPI/DB/GroupManager.cs b/TShockAPI/DB/GroupManager.cs index 895e10b5..edf48de6 100644 --- a/TShockAPI/DB/GroupManager.cs +++ b/TShockAPI/DB/GroupManager.cs @@ -35,7 +35,7 @@ namespace TShockAPI.DB com.CommandText = "INSERT IGNORE INTO GroupList SET GroupName=@groupname, Commands=@commands, OrderBy=@order;"; com.AddParameter("@groupname", "trustedadmin"); com.AddParameter("@commands", "maintenance,cfg,butcher,item,heal,immunetoban,ignorecheatdetection,ignoregriefdetection,usebanneditem,manageusers"); - com.AddParameter("@order", "1"); + com.AddParameter("@order", "0"); com.ExecuteNonQuery(); com.Parameters.Clear(); @@ -45,7 +45,7 @@ namespace TShockAPI.DB com.CommandText = "INSERT IGNORE INTO GroupList SET GroupName=@groupname, Commands=@commands, OrderBy=@order;"; com.AddParameter("@groupname", "admin"); com.AddParameter("@commands", "ban,unban,whitelist,causeevents,spawnboss,spawnmob,managewarp,time,tp,pvpfun,kill,logs,immunetokick,tphere"); - com.AddParameter("@order", "2"); + com.AddParameter("@order", "0"); com.ExecuteNonQuery(); com.Parameters.Clear(); @@ -55,7 +55,7 @@ namespace TShockAPI.DB com.CommandText = "INSERT IGNORE INTO GroupList SET GroupName=@groupname, Commands=@commands, OrderBy=@order;"; com.AddParameter("@groupname", "newadmin"); com.AddParameter("@commands", "kick,editspawn,reservedslot"); - com.AddParameter("@order", "3"); + com.AddParameter("@order", "0"); com.ExecuteNonQuery(); com.Parameters.Clear(); @@ -65,7 +65,7 @@ namespace TShockAPI.DB com.CommandText = "INSERT IGNORE INTO GroupList SET GroupName=@groupname, Commands=@commands, OrderBy=@order;"; com.AddParameter("@groupname", "default"); com.AddParameter("@commands", "canwater,canlava,warp,canbuild"); - com.AddParameter("@order", "4"); + com.AddParameter("@order", "0"); com.ExecuteNonQuery(); com.Parameters.Clear(); diff --git a/TShockAPI/DB/RegionManager.cs b/TShockAPI/DB/RegionManager.cs index e23dc289..7f4393d6 100644 --- a/TShockAPI/DB/RegionManager.cs +++ b/TShockAPI/DB/RegionManager.cs @@ -212,7 +212,7 @@ namespace TShockAPI.DB using (var com = database.CreateCommand()) { com.CommandText = "SELECT * FROM Regions WHERE WorldID=@worldid"; - com.AddParameter("@worldid", Main.worldID.ToString()); + com.AddParameter("@worldid", Main.worldName); using (var reader = com.ExecuteReader()) { Regions.Clear(); @@ -228,7 +228,7 @@ namespace TShockAPI.DB string[] SplitIDs = MergedIDs.Split(','); - Region r = new Region(new Rectangle(X1, Y1, width, height), name, Protected, Main.worldID.ToString()); + Region r = new Region(new Rectangle(X1, Y1, width, height), name, Protected, Main.worldName); r.RegionAllowedIDs = new int[SplitIDs.Length]; try { @@ -295,7 +295,7 @@ namespace TShockAPI.DB { com.CommandText = "DELETE FROM Regions WHERE RegionName=@name AND WorldID=@worldid"; com.AddParameter("@name", name.ToLower()); - com.AddParameter("@worldid", Main.worldID.ToString()); + com.AddParameter("@worldid", Main.worldName); com.ExecuteNonQuery(); ReloadAllRegions(); return true; @@ -317,7 +317,7 @@ namespace TShockAPI.DB com.CommandText = "UPDATE Regions SET Protected=@bool WHERE RegionName=@name AND WorldID=@worldid"; com.AddParameter("@name", name); com.AddParameter("@bool", state ? 1 : 0); - com.AddParameter("@worldid", Main.worldID.ToString()); + com.AddParameter("@worldid", Main.worldName); int q = com.ExecuteNonQuery(); ReloadAllRegions(); return (q > 0); @@ -392,7 +392,7 @@ namespace TShockAPI.DB { com.CommandText = "SELECT * FROM Regions WHERE RegionName=@name AND WorldID=@worldid"; com.AddParameter("@name", regionName); - com.AddParameter("@worldid", Main.worldID.ToString()); + com.AddParameter("@worldid", Main.worldName); string MergedIDs = string.Empty; using (var reader = com.ExecuteReader()) { @@ -408,7 +408,7 @@ namespace TShockAPI.DB com.CommandText = "UPDATE Regions SET UserIds=@ids WHERE RegionName=@name AND WorldID=@worldid"; com.AddParameter("@ids", MergedIDs); com.AddParameter("@name", regionName); - com.AddParameter("@worldid", Main.worldID.ToString()); + com.AddParameter("@worldid", Main.worldName); if (com.ExecuteNonQuery() > 0) { ReloadAllRegions(); diff --git a/TShockAPI/DB/WarpsManager.cs b/TShockAPI/DB/WarpsManager.cs index ca3b7309..993ca6dc 100644 --- a/TShockAPI/DB/WarpsManager.cs +++ b/TShockAPI/DB/WarpsManager.cs @@ -160,7 +160,7 @@ namespace TShockAPI.DB { com.CommandText = "DELETE FROM Warps WHERE WarpName=@name AND WorldID=@worldid"; com.AddParameter("@name", name.ToLower()); - com.AddParameter("@worldid", Main.worldID.ToString()); + com.AddParameter("@worldid", Main.worldName); com.ExecuteNonQuery(); return true; } @@ -180,7 +180,7 @@ namespace TShockAPI.DB { com.CommandText = "SELECT * FROM Warps WHERE WarpName=@name AND WorldID=@worldid"; com.AddParameter("@name", name.ToLower()); - com.AddParameter("@worldid", Main.worldID.ToString()); + com.AddParameter("@worldid", Main.worldName); using (var reader = com.ExecuteReader()) { if (reader.Read())