Merge pull request #1424 from CoderCow/patch-1

Fix crystal and golden chests
This commit is contained in:
Lucas Nicodemus 2017-04-20 08:10:59 -06:00 committed by GitHub
commit f4733199f4

View file

@ -2161,7 +2161,7 @@ namespace TShockAPI
args.Player.SendTileSquare(tileX, tileY, 3); args.Player.SendTileSquare(tileX, tileY, 3);
return true; return true;
} }
if (action == EditAction.PlaceTile && editData == TileID.Containers) if (action == EditAction.PlaceTile && (editData == TileID.Containers || editData == TileID.Containers2))
{ {
if (TShock.Utils.MaxChests()) if (TShock.Utils.MaxChests())
{ {
@ -3166,9 +3166,10 @@ namespace TShockAPI
return true; return true;
} }
if (flag != 0 if (flag != 0 && flag != 4 // if no container or container2 placement
&& Main.tile[tileX, tileY].type != TileID.Containers && Main.tile[tileX, tileY].type != TileID.Containers
&& Main.tile[tileX, tileY].type != TileID.Dressers && Main.tile[tileX, tileY].type != TileID.Dressers
&& Main.tile[tileX, tileY].type != TileID.Containers2
&& (!TShock.Utils.MaxChests() && Main.tile[tileX, tileY].type != TileID.Dirt)) //Chest && (!TShock.Utils.MaxChests() && Main.tile[tileX, tileY].type != TileID.Dirt)) //Chest
{ {
args.Player.SendTileSquare(tileX, tileY, 3); args.Player.SendTileSquare(tileX, tileY, 3);