Handle BlockExplodeEvent as other explosion.

Also misc cleanup. Closes #407, WORLDGUARD-3843.
EngineHub · Jun 8, 2019 · d296e6e · d296e6e
1 parent f76259d
commit d296e6e
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 3 deletions.
diff --git a/...d-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/EventAbstractionListener.java b/...d-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/EventAbstractionListener.java
@@ -880,6 +880,14 @@ public void onBlockDispense(BlockDispenseEvent event) {
         }
     }
 
+    @EventHandler(ignoreCancelled = true)
+    public void onBlockExplode(BlockExplodeEvent event) {
+        final BreakBlockEvent eventToFire = new BreakBlockEvent(event, create(event.getBlock()),
+                event.getBlock().getLocation().getWorld(), event.blockList(), Material.AIR);
+        eventToFire.getRelevantFlags().add(DefaultFlag.OTHER_EXPLOSION);
+        Events.fireBulkEventToCancel(event, eventToFire);
+    }
+
     /**
      * Handle the right click of a block while an item is held.
      *

diff --git a/...rd-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardBlockListener.java b/...rd-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardBlockListener.java
@@ -37,6 +37,7 @@
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.BlockBreakEvent;
 import org.bukkit.event.block.BlockBurnEvent;
+import org.bukkit.event.block.BlockExplodeEvent;
 import org.bukkit.event.block.BlockFadeEvent;
 import org.bukkit.event.block.BlockFormEvent;
 import org.bukkit.event.block.BlockFromToEvent;
@@ -664,4 +665,19 @@ public void onBlockFade(BlockFadeEvent event) {
 
     }
 
+    @EventHandler(ignoreCancelled = true)
+    public void onBlockExplode(BlockExplodeEvent event) {
+        ConfigurationManager cfg = plugin.getGlobalStateManager();
+
+        if (cfg.activityHaltToggle) {
+            event.setCancelled(true);
+            return;
+        }
+
+        WorldConfiguration wcfg = getWorldConfig(event.getBlock().getWorld());
+        if (wcfg.blockOtherExplosions) {
+            event.setCancelled(true);
+        }
+    }
+
 }
diff --git a/...d-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardEntityListener.java b/...d-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardEntityListener.java
@@ -410,9 +410,7 @@ public void onEntityExplode(EntityExplodeEvent event) {
         Entity ent = event.getEntity();
 
         if (cfg.activityHaltToggle) {
-            if (ent != null) {
-                ent.remove();
-            }
+            ent.remove();
             event.setCancelled(true);
             return;
         }