themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Attempting to fix region protection

Browse source
This commit is contained in:
Lucas Nicodemus 2011-07-15 21:26:28 -06:00
parent 485bc61fac
commit 741841028e
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
TShockAPI/DB/RegionManager.cs
View file

@ -217,7 +217,7 @@ namespace TShockAPI.DB
return true; return true;
} }
public bool InArea(int x, int y, User user) public bool InArea(int x, int y)
{ {
for (int i = 0; i < Regions.Count; i++) for (int i = 0; i < Regions.Count; i++)
{ {

4
TShockAPI/GetDataHandlers.cs
View file

@ -278,7 +278,7 @@ namespace TShockAPI
return true; return true;
} }
} }
if (!args.Player.Group.HasPermission("editspawn") && !TShock.Regions.CanBuild(x, y, args.Player)) if (!args.Player.Group.HasPermission("editspawn") && !TShock.Regions.CanBuild(x, y, args.Player) && TShock.Regions.InArea(x, y))
{ {
if ((DateTime.UtcNow - args.Player.LastTileChangeNotify).TotalMilliseconds > 1000) if ((DateTime.UtcNow - args.Player.LastTileChangeNotify).TotalMilliseconds > 1000)
{ {
@ -537,7 +537,7 @@ namespace TShockAPI
args.Player.SendTileSquare(tilex, tiley); args.Player.SendTileSquare(tilex, tiley);
return true; return true;
} }
if (!args.Player.Group.HasPermission("editspawn") && !TShock.Regions.CanBuild(tilex, tiley, args.Player)) if (!args.Player.Group.HasPermission("editspawn") && !TShock.Regions.CanBuild(tilex, tiley, args.Player) && TShock.Regions.InArea(tilex, tiley))
{ {
args.Player.SendMessage("Region protected from changes.", Color.Red); args.Player.SendMessage("Region protected from changes.", Color.Red);
args.Player.SendTileSquare(tilex, tiley); args.Player.SendTileSquare(tilex, tiley);