mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix logic error in water activation range immunity check

Browse source 
was no longer giving immunity to items
This commit is contained in:
Aikar 2018-10-06 01:17:32 -04:00
commit 114fa519b4
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Spigot-Server-Patches/Activation-Range-Improvements.patch
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 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 --- a/src/main/java/org/spigotmc/ActivationRange.java
+++ b/src/main/java/org/spigotmc/ActivationRange.java +++ b/src/main/java/org/spigotmc/ActivationRange.java
@@ -0,0 +0,0 @@ package org.spigotmc; @@ -0,0 +0,0 @@ package org.spigotmc;
@ -243,7 +243,7 @@ index f52de10238..05e10fb366 100644
+ if (entity instanceof EntityFish) { + if (entity instanceof EntityFish) {
+ return false; + 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; return true;
} }
+ if (entity.fireTicks > 0) { + if (entity.fireTicks > 0) {