diff options
author | Iaccidentally <coryhuckaby@gmail.com> | 2013-01-11 11:03:05 -0800 |
---|---|---|
committer | Iaccidentally <coryhuckaby@gmail.com> | 2013-01-11 11:03:05 -0800 |
commit | d7c29ff0fd325fe70b3c238a49a4f5607056dc86 (patch) | |
tree | 347f57af602ff4ae8290dfec29611773b1e4e43b /EssentialsAntiBuild/src/net/ess3 | |
parent | a4c93fef05493e6210e8d3d72af7b6d492f4e121 (diff) | |
parent | 502d0197c649536c95f539260475572f99cd3541 (diff) | |
download | Essentials-d7c29ff0fd325fe70b3c238a49a4f5607056dc86.tar Essentials-d7c29ff0fd325fe70b3c238a49a4f5607056dc86.tar.gz Essentials-d7c29ff0fd325fe70b3c238a49a4f5607056dc86.tar.lz Essentials-d7c29ff0fd325fe70b3c238a49a4f5607056dc86.tar.xz Essentials-d7c29ff0fd325fe70b3c238a49a4f5607056dc86.zip |
Merge pull request #255 from GunfighterJ/patch-1
Fixes link between Item Frames and Paintings when breaking :: Note: Does not currently work, needs later testing when 3.0 is more complete
Diffstat (limited to 'EssentialsAntiBuild/src/net/ess3')
-rw-r--r-- | EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsAntiBuildListener.java | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsAntiBuildListener.java b/EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsAntiBuildListener.java index 81acdc1e3..250bca9dd 100644 --- a/EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsAntiBuildListener.java +++ b/EssentialsAntiBuild/src/net/ess3/antibuild/EssentialsAntiBuildListener.java @@ -6,6 +6,7 @@ import net.ess3.api.IUser; 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; @@ -108,15 +109,27 @@ public class EssentialsAntiBuildListener implements Listener final Entity entity = event.getRemover(); if (entity instanceof Player) { + final Boolean warn = antib.getSettings().getData().isWarnOnBuildDisallow(); + final EntityType type = event.getEntity().getType(); final IUser user = ess.getUserMap().getUser((Player)entity); - if (antib.getSettings().getData().isDisableBuild() && !Permissions.BUILD.isAuthorized(user) && !Permissions.BREAK.isAuthorized( - user, Material.PAINTING, null)) + if (antib.getSettings().getData().isDisableBuild() && !Permissions.BUILD.isAuthorized(user)) { - if (antib.getSettings().getData().isWarnOnBuildDisallow()) + if (type == EntityType.PAINTING && !Permissions.BREAK.isAuthorized(user, Material.PAINTING, null)) { - user.sendMessage(_("antiBuildBreak", Material.PAINTING.toString())); + if (warn) + { + user.sendMessage(_("antiBuildBreak", Material.PAINTING.toString())); + } + event.setCancelled(true); + } + else if (type == EntityType.ITEM_FRAME && !Permissions.BREAK.isAuthorized(user, Material.ITEM_FRAME, null)) + { + if (warn) + { + user.sendMessage(_("antiBuildBreak", Material.ITEM_FRAME.toString())); + } + event.setCancelled(true); } - event.setCancelled(true); } } } |