diff --git a/plugins/citadel-paper/src/com/untamedears/citadel/Utility.java b/plugins/citadel-paper/src/com/untamedears/citadel/Utility.java index 65bb3d68f..7da5c4ce3 100644 --- a/plugins/citadel-paper/src/com/untamedears/citadel/Utility.java +++ b/plugins/citadel-paper/src/com/untamedears/citadel/Utility.java @@ -132,6 +132,17 @@ public class Utility { } } + public static boolean explodeReinforcement(Block block) { + AccessDelegate delegate = AccessDelegate.getDelegate(block); + IReinforcement reinforcement = delegate.getReinforcement(); + if (reinforcement == null) { + return false; + } else if(reinforcement instanceof NaturalReinforcement) { + return reinforcementBroken(reinforcement); + } + return reinforcementDamaged(reinforcement); + } + public static boolean maybeReinforcementDamaged(Block block) { AccessDelegate delegate = AccessDelegate.getDelegate(block); IReinforcement reinforcement = delegate.getReinforcement(); diff --git a/plugins/citadel-paper/src/com/untamedears/citadel/listener/EntityListener.java b/plugins/citadel-paper/src/com/untamedears/citadel/listener/EntityListener.java index e8342c81c..dcf509a5e 100644 --- a/plugins/citadel-paper/src/com/untamedears/citadel/listener/EntityListener.java +++ b/plugins/citadel-paper/src/com/untamedears/citadel/listener/EntityListener.java @@ -1,5 +1,6 @@ package com.untamedears.citadel.listener; +import static com.untamedears.citadel.Utility.explodeReinforcement; import static com.untamedears.citadel.Utility.maybeReinforcementDamaged; import java.util.ArrayList; @@ -36,7 +37,7 @@ public class EntityListener implements Listener { while (iterator.hasNext()) { Block block = iterator.next(); try { - if (maybeReinforcementDamaged(block)) { + if (explodeReinforcement(block)) { block.getDrops().clear(); iterator.remove(); }