Revert "Revert "Merge branch 'patch-28' into general-devel""
This reverts commit 258b21dddb.
This commit is contained in:
parent
bf684ab89b
commit
89555beb73
2 changed files with 3 additions and 1 deletions
|
|
@ -308,7 +308,8 @@ namespace TShockAPI
|
|||
return;
|
||||
}
|
||||
|
||||
if (selectedItem.placeStyle != style)
|
||||
if ((args.Player.TPlayer.BiomeTorchHoldStyle(style) != args.Player.TPlayer.BiomeTorchPlaceStyle(style))
|
||||
&& (selectedItem.placeStyle != style))
|
||||
{
|
||||
TShock.Log.ConsoleError("Bouncer / OnTileEdit rejected from (placestyle) {0} {1} {2} placeStyle: {3} expectedStyle: {4}",
|
||||
args.Player.Name, action, editData, style, selectedItem.placeStyle);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue