From be3eaba002a6f9ae44952125aca2c7e9bd10338e Mon Sep 17 00:00:00 2001 From: Driftay Date: Sun, 31 Mar 2019 01:06:21 -0400 Subject: [PATCH] Fixed Obsidian Bug --- .../factions/listeners/FactionsEntityListener.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/main/java/com/massivecraft/factions/listeners/FactionsEntityListener.java b/src/main/java/com/massivecraft/factions/listeners/FactionsEntityListener.java index e7651f05..13330cfa 100644 --- a/src/main/java/com/massivecraft/factions/listeners/FactionsEntityListener.java +++ b/src/main/java/com/massivecraft/factions/listeners/FactionsEntityListener.java @@ -256,11 +256,7 @@ public class FactionsEntityListener implements Listener { } // Cancel the event if no block will explode - if (event.blockList().isEmpty()) { - event.setCancelled(true); - - // Or handle the exploit of TNT in water/lava - } else if ((boomer instanceof TNTPrimed || boomer instanceof ExplosiveMinecart) && Conf.handleExploitTNTWaterlog) { + if (!event.blockList().isEmpty() && (boomer instanceof TNTPrimed || boomer instanceof ExplosiveMinecart) && Conf.handleExploitTNTWaterlog) { // TNT in water/lava doesn't normally destroy any surrounding blocks, which is usually desired behavior, but... // this change below provides workaround for waterwalling providing perfect protection, // and makes cheap (non-obsidian) TNT cannons require minor maintenance between shots