From a79f3d9e54c24c8c00d8b53295bfcdd6c5604b63 Mon Sep 17 00:00:00 2001 From: boy0001 Date: Tue, 3 Mar 2015 00:36:11 +1100 Subject: [PATCH] Potentially fixed BlockDamage in survival mode --- .../plot/listeners/PlayerEvents.java | 61 ++++++++++++++++--- 1 file changed, 54 insertions(+), 7 deletions(-) diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/PlayerEvents.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/PlayerEvents.java index 17ebf1b57..f3b2e4723 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/PlayerEvents.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/PlayerEvents.java @@ -412,16 +412,63 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi } @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true) - public static void onBD(final BlockDamageEvent e) { - final Block b = e.getBlock(); - final Location loc = BukkitUtil.getLocation(b.getLocation()); - if (isPlotWorld(loc)) { - if (!isInPlot(loc)) { - if (isPlotArea(BukkitUtil.getLocation(e.getBlock().getLocation()))) { - e.setCancelled(true); + public static void onBD(final BlockDamageEvent event) { + final Player player = event.getPlayer(); + if (player == null) { + final Location loc = BukkitUtil.getLocation(event.getBlock().getLocation()); + if (isPlotWorld(loc)) { + if (!isInPlot(loc)) { + if (isPlotArea(loc)) { + event.setCancelled(true); + } } } } + final String world = player.getWorld().getName(); + if (!isPlotWorld(world)) { + return; + } + final Location loc = BukkitUtil.getLocation(event.getBlock().getLocation()); + final Plot plot = getCurrentPlot(loc); + if (plot != null) { + if (event.getBlock().getY() == 0) { + event.setCancelled(true); + return; + } + if (!plot.hasOwner()) { + final PlotPlayer pp = BukkitUtil.getPlayer(player); + if (Permissions.hasPermission(pp, "plots.admin.destroy.unowned")) { + return; + } + MainUtil.sendMessage(pp, C.NO_PERMISSION, "plots.admin.destroy.unowned"); + event.setCancelled(true); + return; + } + final PlotPlayer pp = BukkitUtil.getPlayer(player); + if (!plot.isAdded(pp.getUUID())) { + final Flag destroy = FlagManager.getPlotFlag(plot, "break"); + final Block block = event.getBlock(); + if ((destroy != null) && ((HashSet) destroy.getValue()).contains(new PlotBlock((short) block.getTypeId(), block.getData()))) { + return; + } + if (Permissions.hasPermission(pp, "plots.admin.destroy.other")) { + return; + } + MainUtil.sendMessage(pp, C.NO_PERMISSION, "plots.admin.destroy.other"); + event.setCancelled(true); + return; + } + return; + } + final PlotPlayer pp = BukkitUtil.getPlayer(player); + if (Permissions.hasPermission(pp, "plots.admin.destroy.road")) { + return; + } + if (isPlotArea(loc)) { + MainUtil.sendMessage(pp, C.NO_PERMISSION, "plots.admin.destroy.road"); + event.setCancelled(true); + return; + } } @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)