Even better solution

This commit is contained in:
stacey 2021-05-27 18:39:50 -04:00 committed by GitHub
parent 8b3e1b68c9
commit a5eeb0788a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -304,25 +304,14 @@ namespace TShockAPI
return; return;
} }
if (args.Player.TPlayer.unlockedBiomeTorches && args.Player.TPlayer.UsingBiomeTorches if ((args.Player.TPlayer.BiomeTorchHoldStyle(style) != args.Player.TPlayer.BiomeTorchPlaceStyle(style))
&& selectedItem.type == ItemID.Torch && editData == TileID.Torches) && (selectedItem.placeStyle != style))
{ {
if (style != TorchID.Demon TShock.Log.ConsoleError("Bouncer / OnTileEdit rejected from (placestyle) {0} {1} {2} placeStyle: {3} expectedStyle: {4}",
&& style != TorchID.Ice args.Player.Name, action, editData, style, selectedItem.placeStyle);
&& style != TorchID.Bone args.Player.SendTileSquare(tileX, tileY, 1);
&& style != TorchID.Desert args.Handled = true;
&& style != TorchID.Corrupt return;
&& style != TorchID.Crimson
&& style != TorchID.Hallowed
&& style != TorchID.Jungle
&& selectedItem.placeStyle != style)
{
TShock.Log.ConsoleError(string.Format("Bouncer / OnTileEdit rejected from (placestyle) {0} {1} {2} placeStyle: {3} expectedStyle: {4}",
args.Player.Name, action, editData, style, selectedItem.placeStyle));
args.Player.SendTileSquare(tileX, tileY, 1);
args.Handled = true;
return;
}
} }
} }