From e28e2d2132e0fdd866997af9898c0feb60a387e5 Mon Sep 17 00:00:00 2001 From: Twitchy Date: Sat, 25 Jun 2011 13:20:34 +1200 Subject: [PATCH 1/3] Seems to fix the client crash on TP glitch. --- TShockAPI/TSPlayer.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/TShockAPI/TSPlayer.cs b/TShockAPI/TSPlayer.cs index a090f8a8..1d614b23 100644 --- a/TShockAPI/TSPlayer.cs +++ b/TShockAPI/TSPlayer.cs @@ -143,6 +143,7 @@ namespace TShockAPI Main.spawnTileX = tileX; Main.spawnTileY = tileY; SendData(PacketTypes.WorldInfo); + SendTileSquare(tileX, tileY, 30); if (TPlayer.SpawnX >= 0 && TPlayer.SpawnY >= 0) { Main.tile[TPlayer.SpawnX, TPlayer.SpawnY].active = false; From bc337cdf573d6a515942dd840a68a5543525a1ee Mon Sep 17 00:00:00 2001 From: Twitchy Date: Sat, 25 Jun 2011 15:15:49 +1200 Subject: [PATCH 2/3] Fixed banneditems.txt not allowing over ID 200. Minor change --- TShockAPI/ItemManager.cs | 2 +- TShockAPI/RegionManager.cs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/TShockAPI/ItemManager.cs b/TShockAPI/ItemManager.cs index 1a139ee0..626d28cc 100644 --- a/TShockAPI/ItemManager.cs +++ b/TShockAPI/ItemManager.cs @@ -25,7 +25,7 @@ namespace TShockAPI int ID = -1; if (Int32.TryParse(line, out ID)) { - if (ID <= Main.item.Length) + if (ID <= 326) //MUST CHANGE ON EACH UPDATE { var item = Tools.GetItemById(ID); BannedItems.Add(new ItemBan(ID, item.name)); diff --git a/TShockAPI/RegionManager.cs b/TShockAPI/RegionManager.cs index 8d869de6..1a7ccf5e 100644 --- a/TShockAPI/RegionManager.cs +++ b/TShockAPI/RegionManager.cs @@ -129,11 +129,13 @@ namespace TShockAPI settingsw.WriteElementString("Point2Y", region.RegionArea.Height.ToString()); settingsw.WriteElementString("Protected", region.DisableBuild.ToString()); settingsw.WriteElementString("WorldName", region.WorldRegionName); + settingsw.WriteElementString("AllowedUserCount", region.RegionAllowedIPs.Count.ToString()); for (int i = 0; i < region.RegionAllowedIPs.Count; i++) { settingsw.WriteElementString("IP", region.RegionAllowedIPs[i]); } + settingsw.WriteEndElement(); } @@ -231,12 +233,10 @@ namespace TShockAPI settingr.Read(); settingr.Read(); if (settingr.Value != "" || settingr.Value != null) - worldname = settingr.Value; + worldname = settingr.Value; else Log.Warn("Worldname for region " + name + " is empty"); - Console.WriteLine(settingr.Value); - settingr.Read(); settingr.Read(); settingr.Read(); From 8f65a7d0a06367f969e74ad5a312b36d4b4ba338 Mon Sep 17 00:00:00 2001 From: Twitchy Date: Sat, 25 Jun 2011 15:39:31 +1200 Subject: [PATCH 3/3] Fixed fail itembans.txt update. *facepalm* --- TShockAPI/ItemManager.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TShockAPI/ItemManager.cs b/TShockAPI/ItemManager.cs index 626d28cc..e1c2b97c 100644 --- a/TShockAPI/ItemManager.cs +++ b/TShockAPI/ItemManager.cs @@ -25,7 +25,7 @@ namespace TShockAPI int ID = -1; if (Int32.TryParse(line, out ID)) { - if (ID <= 326) //MUST CHANGE ON EACH UPDATE + if (ID < Main.maxItemTypes && ID > 0) { var item = Tools.GetItemById(ID); BannedItems.Add(new ItemBan(ID, item.name));