From f2cc3ce89f30d7cf8867a68b4eba48dde84ee9c4 Mon Sep 17 00:00:00 2001 From: ProfessorXZ Date: Wed, 17 Aug 2016 21:45:44 +0200 Subject: [PATCH] Remove unnecessary code from HandleTile() --- TShockAPI/GetDataHandlers.cs | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs index cef3ff80..9280dbe9 100755 --- a/TShockAPI/GetDataHandlers.cs +++ b/TShockAPI/GetDataHandlers.cs @@ -2154,28 +2154,15 @@ namespace TShockAPI return true; } - // 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)) - //{ - // 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; } @@ -4036,7 +4023,7 @@ namespace TShockAPI /// /// For use with a ToggleGemLock event /// - public class GemLockToggleEventArgs : HandledEventArgs + public class GemLockToggleEventArgs : HandledEventArgs { /// /// X Location @@ -4057,12 +4044,12 @@ namespace TShockAPI /// public static HandlerList GemLockToggle; - private static bool OnGemLockToggle(Int32 x, Int32 y, bool on) + private static bool OnGemLockToggle(Int32 x, Int32 y, bool on) { if (GemLockToggle == null) return false; - var args = new GemLockToggleEventArgs + var args = new GemLockToggleEventArgs { X = x, Y = y, @@ -4078,12 +4065,12 @@ namespace TShockAPI var y = (int)args.Data.ReadInt16(); var on = args.Data.ReadBoolean(); - if (x < 0 || y < 0 || x >= Main.maxTilesX || y >= Main.maxTilesY) + if (x < 0 || y < 0 || x >= Main.maxTilesX || y >= Main.maxTilesY) { return true; } - if (OnGemLockToggle(x, y, on)) + if (OnGemLockToggle(x, y, on)) { return true; } @@ -4093,17 +4080,17 @@ namespace TShockAPI return false; } - if (!TShock.Utils.TilePlacementValid(x, y) || (args.Player.Dead && TShock.Config.PreventDeadModification)) + if (!TShock.Utils.TilePlacementValid(x, y) || (args.Player.Dead && TShock.Config.PreventDeadModification)) { return true; } - if (TShock.CheckIgnores(args.Player)) + if (TShock.CheckIgnores(args.Player)) { return true; } - if (TShock.CheckTilePermission(args.Player, x, y)) + if (TShock.CheckTilePermission(args.Player, x, y)) { return true; }