Merge branch 'general-devel' of github.com:TShock/TShock into general-devel

Conflicts:
	TShockAPI/Properties/AssemblyInfo.cs
This commit is contained in:
high 2011-09-24 18:31:05 -04:00
commit c4b2d6f438
3 changed files with 13 additions and 2 deletions

View file

@ -349,6 +349,13 @@ namespace TShockAPI
args.Player.SendTileSquare(x, y);
return true;
}
if (type == 1 && tiletype == 21 && Tools.MaxChests())
{
args.Player.SendMessage("Reached world's max chest limit, unable to place more!", Color.Red);
Log.Info("Reached world's chest limit, unable to place more.");
args.Player.SendTileSquare(x, y);
return true;
}
}
if (!args.Player.Group.HasPermission(Permissions.editspawn) && !TShock.Regions.CanBuild(x, y, args.Player) && TShock.Regions.InArea(x, y))
{