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

Merge remote-tracking branch 'origin/master' into master

Browse Source
This commit is contained in:
Auxilor 2021-03-26 22:43:48 +00:00
commit d2af2bf31e
2 changed files with 13 additions and 7 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)) {

2
gradle.properties
View File

@ -1,2 +1,2 @@
version = 6.10.9
version = 6.10.10
plugin-name = EcoEnchants