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

Remove redundant region checks

Browse source
This commit is contained in:
ProfessorXZ 2016-08-02 19:22:47 +02:00
parent 0919641b7f
commit 37d9e93e6c
2 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
TShockAPI/DB/RegionManager.cs
View file

@ -759,7 +759,7 @@ namespace TShockAPI.DB
return false; return false;
} }
return AllowedIDs.Contains(ply.User.ID) || AllowedGroups.Contains(ply.Group.Name) || Owner == ply.User.Name; return ply.HasPermission(Permissions.editregion) || AllowedIDs.Contains(ply.User.ID) || AllowedGroups.Contains(ply.Group.Name) || Owner == ply.User.Name;
} }
/// <summary> /// <summary>

9
TShockAPI/TShock.cs
View file

@ -497,8 +497,7 @@ namespace TShockAPI
if (args.Chest != null) if (args.Chest != null)
{ {
if (Config.RegionProtectChests && !tsplr.HasPermission(Permissions.editregion) if (Config.RegionProtectChests && !Regions.CanBuild((int)args.Position.X, (int)args.Position.Y, tsplr))
&& !Regions.CanBuild((int)args.Position.X, (int)args.Position.Y, tsplr) && Regions.InArea((int)args.Position.X, (int)args.Position.Y))
{ {
args.Handled = true; args.Handled = true;
return; return;
@ -1741,8 +1740,7 @@ namespace TShockAPI
return true; return true;
} }
if (!player.HasPermission(Permissions.editregion) && !Regions.CanBuild(tileX, tileY, player) && if (!Regions.CanBuild(tileX, tileY, player))
Regions.InArea(tileX, tileY))
{ {
if (((DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond) - player.RPm) > 2000) if (((DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond) - player.RPm) > 2000)
{ {
@ -1809,8 +1807,7 @@ namespace TShockAPI
return true; return true;
} }
if (!player.HasPermission(Permissions.editregion) && !Regions.CanBuild(tileX, tileY, player) && if (!Regions.CanBuild(tileX, tileY, player))
Regions.InArea(tileX, tileY))
{ {
if (((DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond) - player.RPm) > 2000) if (((DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond) - player.RPm) > 2000)
{ {