Merge commit '48ef0ee1a5' into general-devel

This commit is contained in:
Deathmax 2011-08-21 22:38:04 +08:00
commit 9fed5338a4

View file

@ -284,8 +284,15 @@ namespace TShockAPI
byte tiletype = args.Data.ReadInt8(); byte tiletype = args.Data.ReadInt8();
if (args.Player.AwaitingName) if (args.Player.AwaitingName)
{
if (TShock.Regions.InAreaRegionName(x, y) == null)
{
args.Player.SendMessage("Region is not protected", Color.Yellow);
}
else
{ {
args.Player.SendMessage("Region Name: " + TShock.Regions.InAreaRegionName(x, y), Color.Yellow); args.Player.SendMessage("Region Name: " + TShock.Regions.InAreaRegionName(x, y), Color.Yellow);
}
args.Player.SendTileSquare(x, y); args.Player.SendTileSquare(x, y);
args.Player.AwaitingName = false; args.Player.AwaitingName = false;
return true; return true;