From 775c724b4460e904ca845c41fb5e8ff45805af7f Mon Sep 17 00:00:00 2001 From: ProfessorXZ Date: Sat, 10 Sep 2016 22:58:32 +0200 Subject: [PATCH 1/2] Fixed IceRod not placing ice blocks --- TShockAPI/GetDataHandlers.cs | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs index 9280dbe9..e8b23d02 100755 --- a/TShockAPI/GetDataHandlers.cs +++ b/TShockAPI/GetDataHandlers.cs @@ -2048,19 +2048,8 @@ namespace TShockAPI return true; } - // If they aren't selecting the item which creates the correct tile or wall, they're hacking. - if (editData != (action == EditAction.PlaceTile ? selectedItem.createTile : selectedItem.createWall)) - { - args.Player.SendTileSquare(tileX, tileY, 4); - return true; - } - // If they aren't selecting the item which creates the tile or wall, they're hacking. - if ((editData != TileID.MagicalIceBlock - && editData != TileID.Rope - && editData != TileID.SilkRope - && editData != TileID.VineRope - && editData != TileID.WebRope) + if (editData != TileID.MagicalIceBlock && editData != (action == EditAction.PlaceTile ? selectedItem.createTile : selectedItem.createWall)) { args.Player.SendTileSquare(tileX, tileY, 4); From 9974441868fc4715ffaf6f59528959414acc9fc2 Mon Sep 17 00:00:00 2001 From: ProfessorXZ Date: Mon, 12 Sep 2016 22:20:06 +0200 Subject: [PATCH 2/2] Added an extra IceRod check to HandleTile --- TShockAPI/GetDataHandlers.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs index e8b23d02..045e1651 100755 --- a/TShockAPI/GetDataHandlers.cs +++ b/TShockAPI/GetDataHandlers.cs @@ -2049,9 +2049,13 @@ namespace TShockAPI } // If they aren't selecting the item which creates the tile or wall, they're hacking. - if (editData != TileID.MagicalIceBlock - && editData != (action == EditAction.PlaceTile ? selectedItem.createTile : selectedItem.createWall)) + if (editData != (action == EditAction.PlaceTile ? selectedItem.createTile : selectedItem.createWall)) { + if (selectedItem.netID == ItemID.IceRod && editData == TileID.MagicalIceBlock) + { + return false; + } + args.Player.SendTileSquare(tileX, tileY, 4); return true; }