diff --git a/TShockAPI/Configuration/TShockConfig.cs b/TShockAPI/Configuration/TShockConfig.cs index d87dfa22..8a5e3321 100644 --- a/TShockAPI/Configuration/TShockConfig.cs +++ b/TShockAPI/Configuration/TShockConfig.cs @@ -445,14 +445,6 @@ namespace TShockAPI.Configuration [Description("Whether or not to kick users when they surpass the HealOther threshold.")] public bool KickOnHealOtherThresholdBroken = false; - /// Disables a player if this number of tiles is present in a Tile Rectangle packet - [Description("Disables a player if this number of tiles is present in a Tile Rectangle packet")] - public int TileRectangleSizeThreshold = 50; - - /// Whether or not to kick users when they surpass the TileRectangleSize threshold. - [Description("Whether or not to kick users when they surpass the TileRectangleSize threshold.")] - public bool KickOnTileRectangleSizeThresholdBroken = false; - /// Whether or not the server should suppress build permission failure warnings from regions, spawn point, or server edit failure. [Description("Whether or not the server should suppress build permission failure warnings from regions, spawn point, or server edit failure.")] public bool SuppressPermissionFailureNotices = false; diff --git a/TShockAPI/Handlers/SendTileRectHandler.cs b/TShockAPI/Handlers/SendTileRectHandler.cs index 564590fd..8f6c33c8 100644 --- a/TShockAPI/Handlers/SendTileRectHandler.cs +++ b/TShockAPI/Handlers/SendTileRectHandler.cs @@ -232,7 +232,7 @@ namespace TShockAPI.Handlers } } } - + /// /// Processes a tile object consisting of multiple tiles from the tile rect packet /// @@ -290,12 +290,12 @@ namespace TShockAPI.Handlers ITile tile = Main.tile[realX, realY]; - if (tile.type == TileID.LandMine && !newTile.Active) + if (rectWidth == 1 && rectLength == 1 && tile.type == TileID.LandMine && !newTile.Active) { UpdateServerTileState(tile, newTile, TileDataType.Tile); } - if (tile.type == TileID.WirePipe) + if (rectWidth == 1 && rectLength == 1 && tile.type == TileID.WirePipe) { UpdateServerTileState(tile, newTile, TileDataType.Tile); } @@ -500,15 +500,9 @@ namespace TShockAPI.Handlers return true; } - var rectSize = args.Width * args.Length; - if (rectSize > TShock.Config.Settings.TileRectangleSizeThreshold) + if (args.Width > 4 || args.Length > 4) // as of 1.4.3.6 this is the biggest size the client will send in any case { TShock.Log.ConsoleDebug("Bouncer / SendTileRect rejected from non-vanilla tilemod from {0}", args.Player.Name); - if (TShock.Config.Settings.KickOnTileRectangleSizeThresholdBroken) - { - args.Player.Kick("Unexpected tile threshold reached"); - } - return true; }