Split build and use protection

3 files changed, 21 insertions, 2 deletions

diff --git a/Essentials/src/config.yml b/Essentials/src/config.yml
index 1d6e7ef81..dd43da6cd 100644
--- a/Essentials/src/config.yml
+++ b/Essentials/src/config.yml
@@ -413,6 +413,10 @@ protect:
     # Should people with build: false in permissions be allowed to build
     # Set true to disable building for those people
     build: true
+    
+    # Should people with build: false in permissions be allowed to use items
+    # Set true to disable useing for those people
+    use: true
 
     #Should we tell people they are not allowed to build
     warn-on-build-disallow: false
diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java
index aefb6bfe6..7543a5244 100644
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java
+++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java
@@ -7,6 +7,7 @@ import org.bukkit.event.player.PlayerListener;
 import org.bukkit.inventory.ItemStack;
 import com.earth2me.essentials.User;
 import com.earth2me.essentials.Util;
+import org.bukkit.Material;
 import org.bukkit.event.block.Action;
 
 
@@ -30,7 +31,20 @@ public class EssentialsProtectPlayerListener extends PlayerListener
 		}
 		final User user = ess.getUser(event.getPlayer());
 
-		if (prot.getSettingBool(ProtectConfig.disable_build) && !user.canBuild())
+		if (event.hasItem()
+			&& (event.getItem().getType() == Material.WATER_BUCKET
+				|| event.getItem().getType() == Material.LAVA_BUCKET)
+			&& prot.getSettingBool(ProtectConfig.disable_build) && !user.canBuild())
+		{
+			if (ess.getSettings().warnOnBuildDisallow())
+			{
+				user.sendMessage(Util.i18n("buildAlert"));
+			}
+			event.setCancelled(true);
+			return;
+		}
+
+		if (prot.getSettingBool(ProtectConfig.disable_use) && !user.canBuild())
 		{
 			if (ess.getSettings().warnOnBuildDisallow())
 			{
diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/ProtectConfig.java b/EssentialsProtect/src/com/earth2me/essentials/protect/ProtectConfig.java
index 950da0ebf..12b7c9fd9 100644
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/ProtectConfig.java
+++ b/EssentialsProtect/src/com/earth2me/essentials/protect/ProtectConfig.java
@@ -10,7 +10,8 @@ public enum ProtectConfig
 	memstore("protect.memstore", false),
 	disable_contactdmg("protect.disable.contactdmg", false),
 	disable_lavadmg("protect.disable.lavadmg", false),
-	disable_build("protect.disable.build", false),
+	disable_build("protect.disable.build", true),
+	disable_use("protect.disable.use", true),
 	disable_pvp("protect.disable.pvp", false),
 	disable_projectiles("protect.disable.projectiles", false),
 	disable_fall("protect.disable.fall", false),