From 90655adf8c34359d8baca54cdea0f764f01c2828 Mon Sep 17 00:00:00 2001
From: White <monsieur_white@hotmail.com>
Date: Tue, 29 Sep 2015 18:12:09 +0930
Subject: [PATCH] ActiveChest is now correctly tracked. Fixes #1122

---
 TShockAPI/GetDataHandlers.cs | 5 ++++-
 TShockAPI/TSPlayer.cs        | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs
index deb953ff..b9f08d4a 100755
--- a/TShockAPI/GetDataHandlers.cs
+++ b/TShockAPI/GetDataHandlers.cs
@@ -3026,6 +3026,9 @@ namespace TShockAPI
 			{
 				return true;
 			}
+			
+			int id = Chest.FindChest(x, y);
+			args.Player.ActiveChest = id;
 
 			return false;
 		}
@@ -3043,7 +3046,7 @@ namespace TShockAPI
 
 			if (nameLen != 0 && nameLen <= 20)
 				args.Data.ReadString(); // Ignore the name
-
+			
 			args.Player.ActiveChest = id;
 
 			if (TShock.CheckTilePermission(args.Player, x, y) && TShock.Config.RegionProtectChests)
diff --git a/TShockAPI/TSPlayer.cs b/TShockAPI/TSPlayer.cs
index 514ce7a9..55d64e49 100755
--- a/TShockAPI/TSPlayer.cs
+++ b/TShockAPI/TSPlayer.cs
@@ -850,6 +850,7 @@ namespace TShockAPI
 
 			if (ActiveChest != -1)
 			{
+				ActiveChest = -1;
 				SendData(PacketTypes.ChestOpen, "", -1);
 			}