diff options
| author | Iaccidentally <coryhuckaby@gmail.com> | 2013-01-11 12:56:18 -0500 |
|---|---|---|
| committer | Iaccidentally <coryhuckaby@gmail.com> | 2013-01-11 12:56:18 -0500 |
| commit | 3afe8d18f4fa789756c7045abb2d4b16fdfb5311 (patch) | |
| tree | f1a3c7db923964e3ab0e7032cd0ec4ebd89a4564 /EssentialsAntiBuild | |
| parent | 2d4a07b95b7078e99754831145746363679636a1 (diff) | |
| parent | 0b581580c77145fdbab13e4c72b79b6000524740 (diff) | |
| download | Essentials-3afe8d18f4fa789756c7045abb2d4b16fdfb5311.tar Essentials-3afe8d18f4fa789756c7045abb2d4b16fdfb5311.tar.gz Essentials-3afe8d18f4fa789756c7045abb2d4b16fdfb5311.tar.lz Essentials-3afe8d18f4fa789756c7045abb2d4b16fdfb5311.tar.xz Essentials-3afe8d18f4fa789756c7045abb2d4b16fdfb5311.zip | |
Merge branch '2.9' of https://github.com/essentials/Essentials into 2.9
Diffstat (limited to 'EssentialsAntiBuild')
| -rw-r--r-- | EssentialsAntiBuild/src/com/earth2me/essentials/antibuild/EssentialsAntiBuildListener.java | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/EssentialsAntiBuild/src/com/earth2me/essentials/antibuild/EssentialsAntiBuildListener.java b/EssentialsAntiBuild/src/com/earth2me/essentials/antibuild/EssentialsAntiBuildListener.java index 76089505c..67995c955 100644 --- a/EssentialsAntiBuild/src/com/earth2me/essentials/antibuild/EssentialsAntiBuildListener.java +++ b/EssentialsAntiBuild/src/com/earth2me/essentials/antibuild/EssentialsAntiBuildListener.java @@ -7,6 +7,7 @@ import java.util.logging.Level; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.entity.Entity; +import org.bukkit.entity.EntityType; import org.bukkit.entity.HumanEntity; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -151,14 +152,26 @@ public class EssentialsAntiBuildListener implements Listener if (entity instanceof Player) { final User user = ess.getUser(entity); - if (prot.getSettingBool(AntiBuildConfig.disable_build) && !user.canBuild() && !user.isAuthorized("essentials.build") - && !metaPermCheck(user, "break", Material.PAINTING.getId())) + final EntityType type = event.getEntity().getType(); + final boolean warn = ess.getSettings().warnOnBuildDisallow(); + if (prot.getSettingBool(AntiBuildConfig.disable_build) && !user.canBuild() && !user.isAuthorized("essentials.build")) { - if (ess.getSettings().warnOnBuildDisallow()) + if (type == EntityType.PAINTING && !metaPermCheck(user, "break", Material.PAINTING.getId())) { - user.sendMessage(_("antiBuildBreak", Material.PAINTING.toString())); + if (warn) + { + user.sendMessage(_("antiBuildBreak", Material.PAINTING.toString())); + } + event.setCancelled(true); + } + else if(type == EntityType.ITEM_FRAME && !metaPermCheck(user, "break", Material.ITEM_FRAME.getId())) + { + if (warn) + { + user.sendMessage(_("antiBuildBreak", Material.ITEM_FRAME.toString())); + } + event.setCancelled(true); } - event.setCancelled(true); } } } |