diff --git a/SqlBins/Mono.Data.Sqlite.dll b/SqlBins/Mono.Data.Sqlite.dll index 6955f012..ce600dbc 100644 Binary files a/SqlBins/Mono.Data.Sqlite.dll and b/SqlBins/Mono.Data.Sqlite.dll differ diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs index 035d3b43..f33bd25f 100644 --- a/TShockAPI/GetDataHandlers.cs +++ b/TShockAPI/GetDataHandlers.cs @@ -537,7 +537,7 @@ namespace TShockAPI args.Player.TileThreshold++; var coords = new Vector2(x, y); if (!args.Player.TilesDestroyed.ContainsKey(coords)) - args.Player.TilesDestroyed.Add(coords, Main.tile[x, y].Data); + args.Player.TilesDestroyed.Add(coords, Main.tile[x, y]); } if ((DateTime.UtcNow - args.Player.LastExplosive).TotalMilliseconds < 1000) diff --git a/TShockAPI/Properties/AssemblyInfo.cs b/TShockAPI/Properties/AssemblyInfo.cs index c5074b76..64e10ebe 100644 --- a/TShockAPI/Properties/AssemblyInfo.cs +++ b/TShockAPI/Properties/AssemblyInfo.cs @@ -36,5 +36,5 @@ using System.Runtime.InteropServices; // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.3.4.1215")] -[assembly: AssemblyFileVersion("3.3.4.1215")] +[assembly: AssemblyVersion("3.3.4.1216")] +[assembly: AssemblyFileVersion("3.3.4.1216")] diff --git a/TShockAPI/TSPlayer.cs b/TShockAPI/TSPlayer.cs index 3eb3a154..4ea74b01 100644 --- a/TShockAPI/TSPlayer.cs +++ b/TShockAPI/TSPlayer.cs @@ -31,7 +31,7 @@ namespace TShockAPI public static readonly TSServerPlayer Server = new TSServerPlayer(); public static readonly TSPlayer All = new TSPlayer("All"); public int TileThreshold { get; set; } - public Dictionary TilesDestroyed { get; protected set; } + public Dictionary TilesDestroyed { get; protected set; } public bool SyncHP { get; set; } public bool SyncMP { get; set; } public Group Group { get; set; } @@ -145,14 +145,14 @@ namespace TShockAPI public TSPlayer(int index) { - TilesDestroyed = new Dictionary(); + TilesDestroyed = new Dictionary(); Index = index; Group = new Group("null"); } protected TSPlayer(String playerName) { - TilesDestroyed = new Dictionary(); + TilesDestroyed = new Dictionary(); Index = -1; FakePlayer = new Player { name = playerName, whoAmi = -1 }; Group = new Group("null"); @@ -418,12 +418,12 @@ namespace TShockAPI NetMessage.SendData((int)PacketTypes.NpcStrike, -1, -1, "", npcid, damage, knockBack, hitDirection); } - public void RevertKillTile(Dictionary destroyedTiles) + public void RevertKillTile(Dictionary destroyedTiles) { // Update Main.Tile first so that when tile sqaure is sent it is correct - foreach (KeyValuePair entry in destroyedTiles) + foreach (KeyValuePair entry in destroyedTiles) { - Main.tile[(int)entry.Key.X, (int)entry.Key.Y].Data = entry.Value; + Main.tile[(int)entry.Key.X, (int)entry.Key.Y] = entry.Value; Log.Debug(string.Format("Reverted DestroyedTile(TileXY:{0}_{1}, Type:{2})", entry.Key.X, entry.Key.Y, Main.tile[(int)entry.Key.X, (int)entry.Key.Y].type)); } diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs index 64ed4710..3939eb72 100644 --- a/TShockAPI/TShock.cs +++ b/TShockAPI/TShock.cs @@ -45,7 +45,7 @@ using TShockAPI.Net; namespace TShockAPI { - [APIVersion(1, 9)] + [APIVersion(1, 10)] public class TShock : TerrariaPlugin { public static readonly Version VersionNum = Assembly.GetExecutingAssembly().GetName().Version; diff --git a/TShockAPI/Utils.cs b/TShockAPI/Utils.cs index f4b8959a..1904033c 100644 --- a/TShockAPI/Utils.cs +++ b/TShockAPI/Utils.cs @@ -356,6 +356,7 @@ namespace TShockAPI try { item.prefix = (byte) i; + item.AffixName(); if (item.name.Trim().ToLower() == name.ToLower()) return new List { i }; if (item.name.Trim().ToLower().StartsWith(name.ToLower())) diff --git a/TerrariaServerBins/TerrariaServer.exe b/TerrariaServerBins/TerrariaServer.exe index 8d7e11cf..aedf6f57 100644 Binary files a/TerrariaServerBins/TerrariaServer.exe and b/TerrariaServerBins/TerrariaServer.exe differ