Merge branch 'sql' of github.com:TShock/TShock into general-devel-sql (test)

This commit is contained in:
Twitchy 2011-07-12 15:49:24 +12:00
commit 9cefc69075
23 changed files with 1369 additions and 834 deletions

View file

@ -275,7 +275,7 @@ namespace TShockAPI
return true;
}
}
if (!args.Player.Group.HasPermission("editspawn") && RegionManager.InProtectedArea(x, y, Tools.GetPlayerIP(args.Player.Name)))
if (!args.Player.Group.HasPermission("editspawn") && TShock.Regions.InProtectedArea(x, y, TShock.Users.GetUserID(args.Player.UserName,args.Player.IP)))
{
if ((DateTime.UtcNow - args.Player.LastTileChangeNotify).TotalMilliseconds > 1000)
{