Merge branch 'patch-28' into general-devel

This commit is contained in:
Lucas Nicodemus 2021-05-28 20:18:56 -07:00
commit d2179e95ff
2 changed files with 5 additions and 3 deletions

View file

@ -308,10 +308,11 @@ namespace TShockAPI
return;
}
if (selectedItem.placeStyle != style)
if ((args.Player.TPlayer.BiomeTorchHoldStyle(style) != args.Player.TPlayer.BiomeTorchPlaceStyle(style))
&& (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));
TShock.Log.ConsoleError("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;