From 4d98dd4d24f4542d0d0d5845b85ddb5fe4dfbba7 Mon Sep 17 00:00:00 2001 From: ProfessorXZ Date: Sun, 14 Aug 2016 23:10:24 +0200 Subject: [PATCH] Explosives are no longer blocked by range checks --- TShockAPI/GetDataHandlers.cs | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs index 27cee024..5b4fb7c6 100755 --- a/TShockAPI/GetDataHandlers.cs +++ b/TShockAPI/GetDataHandlers.cs @@ -2030,7 +2030,6 @@ namespace TShockAPI // If they aren't selecting a hammer, they could be hacking. if (selectedItem.hammer == 0 && !ItemID.Sets.Explosives[selectedItem.netID] && args.Player.RecentFuse == 0 && selectedItem.createWall == 0) { - args.Player.SendTileSquare(tileX, tileY, 1); return true; } @@ -2149,13 +2148,30 @@ namespace TShockAPI } // Ignore rope placement range - if ((editData != TileID.Rope - && editData != TileID.SilkRope - && editData != TileID.VineRope - && editData != TileID.WebRope - && action == EditAction.PlaceTile) - && TShock.CheckRangePermission(args.Player, tileX, tileY)) + //if ((editData != TileID.Rope + // && editData != TileID.SilkRope + // && editData != TileID.VineRope + // && editData != TileID.WebRope + // && action == EditAction.PlaceTile) + // && TShock.CheckRangePermission(args.Player, tileX, tileY)) + //{ + // args.Player.SendTileSquare(tileX, tileY, 4); + // return true; + //} + if (TShock.CheckRangePermission(args.Player, tileX, tileY)) { + if (action == EditAction.PlaceTile && (editData == TileID.Rope || editData == TileID.SilkRope || editData == TileID.VineRope || editData == TileID.WebRope)) + { + args.Player.SendTileSquare(tileX, tileY, 4); + return false; + } + + if ((action == EditAction.KillTile || action == EditAction.KillWall) && ItemID.Sets.Explosives[selectedItem.netID] && args.Player.RecentFuse == 0) + { + args.Player.SendTileSquare(tileX, tileY, 4); + return false; + } + args.Player.SendTileSquare(tileX, tileY, 4); return true; }