diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs index 2134918e..d0fb7e59 100644 --- a/TShockAPI/GetDataHandlers.cs +++ b/TShockAPI/GetDataHandlers.cs @@ -660,7 +660,7 @@ namespace TShockAPI args.Player.TilePlaceThreshold++; var coords = new Vector2(tileX, tileY); if (!args.Player.TilesCreated.ContainsKey(coords)) - args.Player.TilesCreated.Add(coords, Main.tile[tileX, tileY]); + args.Player.TilesCreated.Add(coords, Main.tile[tileX, tileY].Data); } if ((type == 0 || type == 4) && Main.tileSolid[Main.tile[tileX, tileY].type] && !args.Player.Group.HasPermission(Permissions.ignorekilltiledetection)) @@ -668,7 +668,7 @@ namespace TShockAPI args.Player.TileKillThreshold++; var coords = new Vector2(tileX, tileY); if (!args.Player.TilesDestroyed.ContainsKey(coords)) - args.Player.TilesDestroyed.Add(coords, Main.tile[tileX, tileY]); + args.Player.TilesDestroyed.Add(coords, Main.tile[tileX, tileY].Data); } return false; diff --git a/TShockAPI/Properties/AssemblyInfo.cs b/TShockAPI/Properties/AssemblyInfo.cs index e80de2d9..de601674 100644 --- a/TShockAPI/Properties/AssemblyInfo.cs +++ b/TShockAPI/Properties/AssemblyInfo.cs @@ -35,5 +35,5 @@ using System.Runtime.InteropServices; // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.4.1.1224")] -[assembly: AssemblyFileVersion("3.4.1.1224")] \ No newline at end of file +[assembly: AssemblyVersion("3.4.1.1229")] +[assembly: AssemblyFileVersion("3.4.1.1229")] \ No newline at end of file diff --git a/TShockAPI/TSPlayer.cs b/TShockAPI/TSPlayer.cs index 2a5ce28b..ba1338f4 100644 --- a/TShockAPI/TSPlayer.cs +++ b/TShockAPI/TSPlayer.cs @@ -34,8 +34,8 @@ namespace TShockAPI public int TilePlaceThreshold { get; set; } public int TileLiquidThreshold { get; set; } public int ProjectileThreshold { get; set; } - public Dictionary TilesDestroyed { get; protected set; } - public Dictionary TilesCreated { get; protected set; } + public Dictionary TilesDestroyed { get; protected set; } + public Dictionary TilesCreated { get; protected set; } public int FirstMaxHP { get; set; } public int FirstMaxMP { get; set; } public Group Group { get; set; } @@ -168,16 +168,16 @@ namespace TShockAPI public TSPlayer(int index) { - TilesDestroyed = new Dictionary(); - TilesCreated = new Dictionary(); + TilesDestroyed = new Dictionary(); + TilesCreated = new Dictionary(); Index = index; Group = new Group("null"); } protected TSPlayer(String playerName) { - TilesDestroyed = new Dictionary(); - TilesCreated = new Dictionary(); + TilesDestroyed = new Dictionary(); + TilesCreated = new Dictionary(); Index = -1; FakePlayer = new Player { name = playerName, whoAmi = -1 }; Group = new Group("null"); @@ -433,12 +433,12 @@ namespace TShockAPI NetMessage.SendData((int)PacketTypes.NpcStrike, -1, -1, "", npcid, damage, knockBack, hitDirection); } - public void RevertTiles(Dictionary tiles) + public void RevertTiles(Dictionary tiles) { // Update Main.Tile first so that when tile sqaure is sent it is correct - foreach (KeyValuePair entry in tiles) + foreach (KeyValuePair entry in tiles) { - Main.tile[(int)entry.Key.X, (int)entry.Key.Y] = entry.Value; + Main.tile[(int)entry.Key.X, (int)entry.Key.Y].Data = entry.Value; } // Send all players updated tile sqaures foreach (Vector2 coords in tiles.Keys) diff --git a/TerrariaServerBins/TerrariaServer.exe b/TerrariaServerBins/TerrariaServer.exe index bbc3c74e..10301f8c 100644 Binary files a/TerrariaServerBins/TerrariaServer.exe and b/TerrariaServerBins/TerrariaServer.exe differ