From e6f33e7150631b705b729292541c53ae3ad9aeb5 Mon Sep 17 00:00:00 2001 From: zomb Date: Sat, 12 Mar 2016 23:37:45 -1000 Subject: [PATCH 1/3] Fixed bukkit dependency in maven --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7f4452ba1..81f3500cc 100644 --- a/pom.xml +++ b/pom.xml @@ -77,7 +77,7 @@ org.bukkit bukkit - 1.9-SNAPSHOT + 1.9-R0.1-SNAPSHOT com.sk89q From a26db46242819fd3b7985077211b69d155935ac1 Mon Sep 17 00:00:00 2001 From: zomb Date: Tue, 15 Mar 2016 21:59:01 -1000 Subject: [PATCH 2/3] Pyromania Adds block-ignition, which allows fire being set by players, dispensers, explosions, and fireballs (if their origin is the same as the plot that they land in) Adds fire-spread, which allows fire to spread from lava and fire spreading in general Adds block-burn, which allows blocks to burn away --- .../bukkit/listeners/PlayerEvents.java | 127 +++++++++++++++--- .../com/intellectualcrafters/plot/PS.java | 3 + 2 files changed, 108 insertions(+), 22 deletions(-) diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents.java b/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents.java index d247e7a8b..bed6dfb7c 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents.java @@ -51,6 +51,7 @@ import org.bukkit.entity.Creature; import org.bukkit.entity.EnderDragon; import org.bukkit.entity.Entity; import org.bukkit.entity.EntityType; +import org.bukkit.entity.Fireball; import org.bukkit.entity.Hanging; import org.bukkit.entity.HumanEntity; import org.bukkit.entity.LivingEntity; @@ -66,6 +67,7 @@ import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.bukkit.event.block.Action; import org.bukkit.event.block.BlockBreakEvent; +import org.bukkit.event.block.BlockBurnEvent; import org.bukkit.event.block.BlockDamageEvent; import org.bukkit.event.block.BlockDispenseEvent; import org.bukkit.event.block.BlockFadeEvent; @@ -1411,16 +1413,35 @@ public class PlayerEvents extends com.plotsquared.listener.PlotListener implemen return checkEntity(plot, types); } } + + @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) + public void onBlockBurn(final BlockBurnEvent e) { + final Block b = e.getBlock(); + final Location loc = BukkitUtil.getLocation(b.getLocation()); + + PlotArea area = loc.getPlotArea(); + if (area == null) { + return; + } + + final Plot plot = loc.getOwnedPlot(); + if (plot == null || !FlagManager.isBooleanFlag(plot, "block-burn", false)) { + e.setCancelled(true); + return; + } + + } @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) public void onBlockIgnite(final BlockIgniteEvent e) { final Player player = e.getPlayer(); + final Entity ent = e.getIgnitingEntity(); final Block b = e.getBlock(); + final BlockIgniteEvent.IgniteCause c = e.getCause(); final Location loc; if (b != null) { loc = BukkitUtil.getLocation(b.getLocation()); } else { - final Entity ent = e.getIgnitingEntity(); if (ent != null) { loc = BukkitUtil.getLocation(ent); } else { @@ -1435,36 +1456,98 @@ public class PlayerEvents extends com.plotsquared.listener.PlotListener implemen if (area == null) { return; } - if (e.getCause() == BlockIgniteEvent.IgniteCause.LIGHTNING) { + if (c == BlockIgniteEvent.IgniteCause.LIGHTNING) { e.setCancelled(true); return; } - if (player == null) { - e.setCancelled(true); - return; - } - final Player p = e.getPlayer(); + final Plot plot = area.getOwnedPlotAbs(loc); - if (plot == null) { - final PlotPlayer pp = BukkitUtil.getPlayer(p); - if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_ROAD)) { - MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_ROAD); - e.setCancelled(true); - } - } else { - if (!plot.hasOwner()) { - final PlotPlayer pp = BukkitUtil.getPlayer(p); - if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_UNOWNED)) { - MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_UNOWNED); + if (player != null) { + final PlotPlayer pp = BukkitUtil.getPlayer(player); + if (plot == null) { + if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_ROAD)) { + MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_ROAD); e.setCancelled(true); } } else { - final PlotPlayer pp = BukkitUtil.getPlayer(p); - if (!plot.isAdded(pp.getUUID())) { - if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER)) { - MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_OTHER); + if (!plot.hasOwner()) { + if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_UNOWNED)) { + MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_UNOWNED); e.setCancelled(true); } + } else { + if (!plot.isAdded(pp.getUUID())) { + if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_OTHER)) { + MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_BUILD_OTHER); + e.setCancelled(true); + } + } else if (!FlagManager.isPlotFlagTrue(plot, "block-ignition")) { + e.setCancelled(true); + } + } + } + } + else if (ent != null) { + if (plot == null || !FlagManager.isPlotFlagTrue(plot, "block-ignition")) { + e.setCancelled(true); + return; + } + if (c == BlockIgniteEvent.IgniteCause.FIREBALL) { + if (ent instanceof Fireball) { + final Projectile fireball = (Fireball) ent; + if (fireball.getShooter() instanceof Entity) { + final Entity shooter = (Entity) fireball.getShooter(); + if (BukkitUtil.getLocation(shooter.getLocation()).getPlot() == null) { + e.setCancelled(true); + return; + } + if (!BukkitUtil.getLocationFull(shooter).getPlot().equals(plot)) { + e.setCancelled(true); + return; + } + } else if (fireball.getShooter() instanceof BlockProjectileSource) { + final Block shooter = (Block) ((BlockProjectileSource) fireball.getShooter()).getBlock(); + if (BukkitUtil.getLocation(shooter.getLocation()).getPlot() == null) { + e.setCancelled(true); + return; + } + if (!BukkitUtil.getLocation(shooter.getLocation()).getPlot().equals(plot)) { + e.setCancelled(true); + return; + } + } + } + } + + } + else if (e.getIgnitingBlock() != null) { + final Block igniter = e.getIgnitingBlock(); + if (c == BlockIgniteEvent.IgniteCause.FLINT_AND_STEEL) { + if (plot == null || !FlagManager.isPlotFlagTrue(plot, "block-ignition")) { + e.setCancelled(true); + return; + } + if (BukkitUtil.getLocation(igniter.getLocation()).getPlot() == null) { + e.setCancelled(true); + return; + } + if (!BukkitUtil.getLocation(igniter.getLocation()).getPlot().equals(plot)) { + e.setCancelled(true); + return; + } + } + if (c == BlockIgniteEvent.IgniteCause.SPREAD || c == BlockIgniteEvent.IgniteCause.LAVA) { + if (plot == null || !FlagManager.isPlotFlagTrue(plot, "fire-spread")) { + e.setCancelled(true); + return; + } + if (BukkitUtil.getLocation(igniter.getLocation()).getPlot() == null) { + e.setCancelled(true); + return; + } + if (!BukkitUtil.getLocation(igniter.getLocation()).getPlot().equals(plot)) { + e.setCancelled(true); + return; } } } diff --git a/Core/src/main/java/com/intellectualcrafters/plot/PS.java b/Core/src/main/java/com/intellectualcrafters/plot/PS.java index 7ace1dc97..0227e48b7 100644 --- a/Core/src/main/java/com/intellectualcrafters/plot/PS.java +++ b/Core/src/main/java/com/intellectualcrafters/plot/PS.java @@ -1901,6 +1901,9 @@ public class PS { FlagManager.addFlag(new AbstractFlag("use", new FlagValue.PlotBlockListValue())); FlagManager.addFlag(new AbstractFlag("blocked-cmds", new FlagValue.StringListValue())); FlagManager.addFlag(new AbstractFlag("ice-melt", new FlagValue.BooleanValue())); + FlagManager.addFlag(new AbstractFlag("block-ignition", new FlagValue.BooleanValue())); + FlagManager.addFlag(new AbstractFlag("block-burn", new FlagValue.BooleanValue())); + FlagManager.addFlag(new AbstractFlag("fire-spread", new FlagValue.BooleanValue())); FlagManager.addFlag(new AbstractFlag("keep") { @Override public Object parseValueRaw(final String value) { From 4a1c206f98f5a856e07d775de9c116392b7e4b9d Mon Sep 17 00:00:00 2001 From: zomb Date: Tue, 15 Mar 2016 22:25:31 -1000 Subject: [PATCH 3/3] Revert "Fixed bukkit dependency in maven" This reverts commit e6f33e7150631b705b729292541c53ae3ad9aeb5. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 81f3500cc..7f4452ba1 100644 --- a/pom.xml +++ b/pom.xml @@ -77,7 +77,7 @@ org.bukkit bukkit - 1.9-R0.1-SNAPSHOT + 1.9-SNAPSHOT com.sk89q