1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-02-03 21:37:28 +01:00

Fix logic error in water activation range immunity check

was no longer giving immunity to items
This commit is contained in:
Aikar 2018-10-06 01:17:32 -04:00
parent add0f4d4de
commit 114fa519b4

View file

@ -114,7 +114,7 @@ index 9a75cb63ba..cf10605aaa 100644
}
}
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
index f52de10238..05e10fb366 100644
index f52de10238..19881fd71d 100644
--- a/src/main/java/org/spigotmc/ActivationRange.java
+++ b/src/main/java/org/spigotmc/ActivationRange.java
@@ -0,0 +0,0 @@ package org.spigotmc;
@ -243,7 +243,7 @@ index f52de10238..05e10fb366 100644
+ if (entity instanceof EntityFish) {
+ return false;
+ }
+ if ((entity.inWater && entity instanceof EntityInsentient && !(((EntityInsentient) entity).getNavigation() instanceof NavigationGuardian))) {
+ if (entity.inWater && (!(entity instanceof EntityInsentient) || !(((EntityInsentient) entity).getNavigation() instanceof NavigationGuardian))) {
return true;
}
+ if (entity.fireTicks > 0) {