Upstream/EcoEnchants
1
0
Fork 0
mirror of https://github.com/Auxilor/EcoEnchants.git synced 2024-11-25 15:35:11 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed allowonnpc not doing anything

Browse Source
This commit is contained in:
Auxilor 2021-03-24 21:15:41 +00:00
parent 149b055860
commit aa56f2cb46
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/util/WatcherTriggers.java
View File

@ -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)) {