diff options
| author | snowleo <schneeleo@gmail.com> | 2011-07-18 02:30:05 +0200 |
|---|---|---|
| committer | snowleo <schneeleo@gmail.com> | 2011-07-18 02:30:05 +0200 |
| commit | e3a470e2649c1795bcdb8156c5384fb77ca3d8d1 (patch) | |
| tree | b90f277ce94cada572c1df69ef5b7505bb446031 /EssentialsProtect | |
| parent | 1556801834ffc893788e77a49f26a4f217a8c453 (diff) | |
| download | Essentials-e3a470e2649c1795bcdb8156c5384fb77ca3d8d1.tar Essentials-e3a470e2649c1795bcdb8156c5384fb77ca3d8d1.tar.gz Essentials-e3a470e2649c1795bcdb8156c5384fb77ca3d8d1.tar.lz Essentials-e3a470e2649c1795bcdb8156c5384fb77ca3d8d1.tar.xz Essentials-e3a470e2649c1795bcdb8156c5384fb77ca3d8d1.zip | |
Split build and use protection
Diffstat (limited to 'EssentialsProtect')
| -rw-r--r-- | EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java | 16 | ||||
| -rw-r--r-- | EssentialsProtect/src/com/earth2me/essentials/protect/ProtectConfig.java | 3 |
2 files changed, 17 insertions, 2 deletions
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), |