Merge pull request #51 from Nadwey/fix-cauldron-explosions

Remove cauldrons properly upon explosion
BreweryTeam · Nov 14, 2024 · a8138e6 · a8138e6
2 parents 28cd69a + bda0485
commit a8138e6
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/src/main/java/com/dre/brewery/listeners/EntityListener.java b/src/main/java/com/dre/brewery/listeners/EntityListener.java
@@ -1,9 +1,11 @@
 package com.dre.brewery.listeners;
 
+import com.dre.brewery.BCauldron;
 import com.dre.brewery.Barrel;
 import com.dre.brewery.Brew;
 import com.dre.brewery.BreweryPlugin;
 import com.dre.brewery.api.events.barrel.BarrelDestroyEvent;
+import com.dre.brewery.utility.BUtil;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Entity;
@@ -58,6 +60,11 @@ public void onExplode(EntityExplodeEvent event) {
 		Block block;
 		blocks: while (iter.hasNext()) {
 			block = iter.next();
+			BCauldron cauldron = BCauldron.get(block);
+			if (cauldron != null) {
+				BUtil.blockDestroy(block, null, BarrelDestroyEvent.Reason.EXPLODED);
+				continue;
+			}
 			if (!breakEvents.isEmpty()) {
 				for (BarrelDestroyEvent breakEvent : breakEvents) {
 					if (breakEvent.getBarrel().hasBlock(block)) {