diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/util/WatcherTriggers.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/util/WatcherTriggers.java index 09e00263..09587f2a 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/util/WatcherTriggers.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/util/WatcherTriggers.java @@ -94,8 +94,10 @@ public class WatcherTriggers extends PluginDependent implements Listener { Arrow arrow = (Arrow) event.getDamager(); LivingEntity victim = (LivingEntity) event.getEntity(); - if (victim.hasMetadata("NPC")) { - return; + if (!allowOnNPC) { + if (victim.hasMetadata("NPC")) { + return; + } } if (attacker instanceof Player && !AntigriefManager.canInjure((Player) attacker, victim)) { @@ -160,8 +162,10 @@ public class WatcherTriggers extends PluginDependent implements Listener { LivingEntity victim = (LivingEntity) event.getEntity(); - if (victim.hasMetadata("NPC")) { - return; + if (!allowOnNPC) { + if (victim.hasMetadata("NPC")) { + return; + } } if (attacker instanceof Player && !AntigriefManager.canInjure((Player) attacker, victim)) { @@ -261,8 +265,10 @@ public class WatcherTriggers extends PluginDependent implements Listener { LivingEntity attacker = (LivingEntity) event.getDamager(); LivingEntity victim = (LivingEntity) event.getEntity(); - if (victim.hasMetadata("NPC")) { - return; + if (!allowOnNPC) { + if (victim.hasMetadata("NPC")) { + return; + } } if (attacker instanceof Player && !AntigriefManager.canInjure((Player) attacker, victim)) {