diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs
index eff01fa6..f136815b 100644
--- a/TShockAPI/GetDataHandlers.cs
+++ b/TShockAPI/GetDataHandlers.cs
@@ -1883,7 +1883,7 @@ namespace TShockAPI
 				if (action == EditAction.PlaceTile && TShock.Config.PreventInvalidPlaceStyle && ((editData == 4 && style > 8) ||
 					(editData == 13 && style > 4) || (editData == 15 && style > 1) || (editData == 21 && style > 6) ||
 					(editData == 82 && style > 5) || (editData == 91 && style > 3) || (editData == 105 && style > 42) ||
-					(editData == 135 && style > 3) || (editData == 139 && style > 12) || (editData == 144 && style > 2) ||
+					(editData == 135 && style > 3) || (editData == 139 && style > 27) || (editData == 144 && style > 2) ||
 					(editData == 149 && style > 2)))
 				{
 					args.Player.SendTileSquare(tileX, tileY);
diff --git a/TShockAPI/TSPlayer.cs b/TShockAPI/TSPlayer.cs
index 73b5db3b..9701bf93 100644
--- a/TShockAPI/TSPlayer.cs
+++ b/TShockAPI/TSPlayer.cs
@@ -633,7 +633,7 @@ namespace TShockAPI
 			Main.item[itemid].stack = stack;
 			Main.item[itemid].owner = Index;
 			Main.item[itemid].prefix = (byte) prefix;
-		    Main.item[itemid].noGrabDelay = 1;
+			Main.item[itemid].noGrabDelay = 1;
 			Main.item[itemid].velocity = Main.player[this.Index].velocity;
 			NetMessage.SendData((int)PacketTypes.ItemDrop, -1, -1, "", itemid, 0f, 0f, 0f);
 			NetMessage.SendData((int)PacketTypes.ItemOwner, -1, -1, "", itemid, 0f, 0f, 0f);
diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs
index 6daa2094..a66b4309 100644
--- a/TShockAPI/TShock.cs
+++ b/TShockAPI/TShock.cs
@@ -1541,9 +1541,10 @@ namespace TShockAPI
 
 			Item[] inventory = player.TPlayer.inventory;
 			Item[] armor = player.TPlayer.armor;
+			Item[] dye = player.TPlayer.dye;
 			for (int i = 0; i < NetItem.maxNetInventory; i++)
 			{
-				if (i < 49)
+				if (i < NetItem.maxNetInventory - (NetItem.armorSlots + NetItem.dyeSlots))
 				{
 					Item item = new Item();
 					if (inventory[i] != null && inventory[i].netID != 0)
@@ -1560,15 +1561,16 @@ namespace TShockAPI
 						}
 					}
 				}
-				else
+				else if(i < (NetItem.maxNetInventory - (NetItem.armorSlots + NetItem.dyeSlots)))
 				{
 					Item item = new Item();
-					if (armor[i - 48] != null && armor[i - 48].netID != 0)
+					var index = i - (NetItem.maxNetInventory - (NetItem.armorSlots + NetItem.dyeSlots));
+					if (armor[index] != null && armor[index].netID != 0)
 					{
-						item.netDefaults(armor[i - 48].netID);
-						item.Prefix(armor[i - 48].prefix);
+						item.netDefaults(armor[index].netID);
+						item.Prefix(armor[index].prefix);
 						item.AffixName();
-						if (armor[i - 48].stack > item.maxStack)
+						if (armor[index].stack > item.maxStack)
 						{
 							check = true;
 							player.SendMessage(
@@ -1577,6 +1579,24 @@ namespace TShockAPI
 						}
 					}
 				}
+				else if (i < (NetItem.maxNetInventory - (NetItem.armorSlots + NetItem.dyeSlots)))
+				{
+					Item item = new Item();
+					var index = i - (NetItem.maxNetInventory - NetItem.dyeSlots);
+					if (dye[index] != null && dye[index].netID != 0)
+					{
+						item.netDefaults(dye[index].netID);
+						item.Prefix(dye[index].prefix);
+						item.AffixName();
+						if (dye[index].stack > item.maxStack)
+						{
+							check = true;
+							player.SendMessage(
+								String.Format("Stack cheat detected. Remove dye {0} ({1}) and then rejoin", item.name, dye[index].stack),
+								Color.Cyan);
+						}
+					}
+				}
 			}
 
 			return check;