Fix some merge errors

This commit is contained in:
Twitchy 2011-07-12 15:54:40 +12:00
parent 9cefc69075
commit bccbf46164
2 changed files with 1 additions and 2 deletions

View file

@ -534,7 +534,7 @@ namespace TShockAPI
args.Player.SendTileSquare(tilex, tiley);
return true;
}
if (!args.Player.Group.HasPermission("editspawn") && RegionManager.InProtectedArea(tilex, tiley, Tools.GetPlayerIP(args.Player.Name)))
if (!args.Player.Group.HasPermission("editspawn") && TShock.Regions.InProtectedArea(tilex, tiley, Tools.GetPlayerIP(args.Player.Name)))
{
args.Player.SendMessage("Region protected from changes.", Color.Red);
args.Player.SendTileSquare(tilex, tiley);