Altitude/AlttdGriefPrevention
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed farming trust in subdivisions.

Browse Source 
Fixed /ContainerTrust allowing farming in subdivisions.
This commit is contained in:
ryanhamshire 2015-06-29 20:59:58 -07:00
parent ab2d584c9f
commit c1346c6488
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/me/ryanhamshire/GriefPrevention/Claim.java
View File

@ -361,6 +361,16 @@ public class Claim
ClaimPermission permissionLevel = this.playerIDToClaimPermissionMap.get("public"); ClaimPermission permissionLevel = this.playerIDToClaimPermissionMap.get("public");
if(ClaimPermission.Build == permissionLevel) return null; if(ClaimPermission.Build == permissionLevel) return null;
//allow for farming with /containertrust permission
if(this.allowContainers(player) == null)
{
//do allow for farming, if player has /containertrust permission
if(this.placeableForFarming(material))
{
return null;
}
}
//subdivision permission inheritance //subdivision permission inheritance
if(this.parent != null) if(this.parent != null)
return this.parent.allowBuild(player, material); return this.parent.allowBuild(player, material);
@ -370,17 +380,7 @@ public class Claim
if(player.hasPermission("griefprevention.ignoreclaims")) if(player.hasPermission("griefprevention.ignoreclaims"))
reason += " " + GriefPrevention.instance.dataStore.getMessage(Messages.IgnoreClaimsAdvertisement); reason += " " + GriefPrevention.instance.dataStore.getMessage(Messages.IgnoreClaimsAdvertisement);
//allow for farming with /containertrust permission return reason;
if(reason != null && this.allowContainers(player) == null)
{
//do allow for farming, if player has /containertrust permission
if(this.placeableForFarming(material))
{
return null;
}
}
return reason;
} }
private boolean hasExplicitPermission(Player player, ClaimPermission level) private boolean hasExplicitPermission(Player player, ClaimPermission level)