From ca6efe66f34301f09fec1be80ec8d673604e839b Mon Sep 17 00:00:00 2001 From: MarioE Date: Thu, 11 Jul 2013 12:58:40 -0400 Subject: [PATCH] Fixed merge. --- TShockAPI/GetDataHandlers.cs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs index 9d29c502..e8ff6d65 100644 --- a/TShockAPI/GetDataHandlers.cs +++ b/TShockAPI/GetDataHandlers.cs @@ -1800,6 +1800,15 @@ namespace TShockAPI } else if (type == 1 || type == 3) { + if (type == 1 && TShock.Config.PreventInvalidPlaceStyle && ((tiletype == 4 && style > 8) || + (tiletype == 13 && style > 4) || (tiletype == 15 && style > 1) || (tiletype == 21 && style > 6) || + (tiletype == 82 && style > 5) || (tiletype == 91 && style > 3) || (tiletype == 105 && style > 42) || + (tiletype == 135 && style > 3) || (tiletype == 139 && style > 12) || (tiletype == 144 && style > 2) || + (tiletype == 149 && style > 2))) + { + args.Player.SendTileSquare(tileX, tileY); + return true; + } // If they aren't selecting the item which creates the tile or wall, they're hacking. if (tiletype != 127 && tiletype != (type == 1 ? selectedItem.createTile : selectedItem.createWall)) { @@ -1850,15 +1859,6 @@ namespace TShockAPI args.Player.SendTileSquare(tileX, tileY); return true; } - if (type == 1 && TShock.Config.PreventInvalidPlaceStyle && ((tiletype == 4 && style > 8) || - (tiletype == 13 && style > 4) || (tiletype == 15 && style > 1) || (tiletype == 21 && style > 6) || - (tiletype == 82 && style > 5) || (tiletype == 91 && style > 3) || (tiletype == 105 && style > 42) || - (tiletype == 135 && style > 3) || (tiletype == 139 && style > 12) || (tiletype == 144 && style > 2) || - (tiletype == 149 && style > 2))) - { - args.Player.SendTileSquare(tileX, tileY); - return true; - } } if (TShock.CheckIgnores(args.Player))