themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Improve on prev code

Browse source 
Thanks to everyone who helped on discord
This commit is contained in:
stacey 2021-05-27 18:08:53 -04:00 • committed by GitHub
parent 98a93693da
commit 6592a880bc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

24
TShockAPI/Bouncer.cs
View file

@ -304,19 +304,18 @@ namespace TShockAPI
return;
}
if (args.Player.TPlayer.unlockedBiomeTorches && args.Player.TPlayer.UsingBiomeTorches &&
selectedItem.type == ItemID.Torch && editData == TileID.Torches)
if (args.Player.TPlayer.unlockedBiomeTorches && args.Player.TPlayer.UsingBiomeTorches
&& selectedItem.type == ItemID.Torch && editData == TileID.Torches)
{
if (style == TorchID.Demon || style == TorchID.Ice ||
style == TorchID.Bone || style == TorchID.Desert ||
style == TorchID.Corrupt || style == TorchID.Crimson ||
style == TorchID.Hallowed || style == TorchID.Jungle)
{
args.Handled = false;
return;
}
}
else if (selectedItem.placeStyle != style)
if (style != TorchID.Demon
&& style != TorchID.Ice
&& style != TorchID.Bone
&& style != TorchID.Desert
&& style != TorchID.Corrupt
&& 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));
@ -325,6 +324,7 @@ namespace TShockAPI
return;
}
}
}
if (action == EditAction.KillTile && !Main.tileCut[tile.type] && !breakableTiles.Contains(tile.type))
{