From aa56f2cb46dc4c8e9de92839012cadde0ceb89f3 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Wed, 24 Mar 2021 21:15:41 +0000 Subject: [PATCH 1/2] Fixed allowonnpc not doing anything --- .../enchantments/util/WatcherTriggers.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) 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)) { From 71b86a12b8e9bded14a02eec86d64de53e73b681 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Wed, 24 Mar 2021 21:16:43 +0000 Subject: [PATCH 2/2] Updated to 6.10.10 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index b0448240..8de4d52e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ -version = 6.10.9 +version = 6.10.10 plugin-name = EcoEnchants \ No newline at end of file