From c1346c64885f2c0f258755ac36d2a69a6c489bee Mon Sep 17 00:00:00 2001
From: ryanhamshire <ryanhamshire@live.com>
Date: Mon, 29 Jun 2015 20:59:58 -0700
Subject: [PATCH] Fixed farming trust in subdivisions.

Fixed /ContainerTrust allowing farming in subdivisions.
---
 .../ryanhamshire/GriefPrevention/Claim.java   | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/me/ryanhamshire/GriefPrevention/Claim.java b/src/me/ryanhamshire/GriefPrevention/Claim.java
index d64dba7..8d856c7 100644
--- a/src/me/ryanhamshire/GriefPrevention/Claim.java
+++ b/src/me/ryanhamshire/GriefPrevention/Claim.java
@@ -361,6 +361,16 @@ public class Claim
 		ClaimPermission permissionLevel = this.playerIDToClaimPermissionMap.get("public");
 		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
 		if(this.parent != null)
 			return this.parent.allowBuild(player, material);
@@ -370,17 +380,7 @@ public class Claim
 		if(player.hasPermission("griefprevention.ignoreclaims"))
 				reason += "  " + GriefPrevention.instance.dataStore.getMessage(Messages.IgnoreClaimsAdvertisement);
 		
-		//allow for farming with /containertrust permission
-		if(reason != null && this.allowContainers(player) == null)
-        {
-            //do allow for farming, if player has /containertrust permission
-            if(this.placeableForFarming(material))
-            {
-                return null;
-            }
-        }
-        
-        return reason;
+		return reason;
 	}
 	
 	private boolean hasExplicitPermission(Player player, ClaimPermission level)