From 114fa519b4743b9fc30c0ff886b958e6c220a383 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 6 Oct 2018 01:17:32 -0400
Subject: [PATCH] Fix logic error in water activation range immunity check

was no longer giving immunity to items
---
 Spigot-Server-Patches/Activation-Range-Improvements.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Spigot-Server-Patches/Activation-Range-Improvements.patch b/Spigot-Server-Patches/Activation-Range-Improvements.patch
index df0432667b..bdeaff2978 100644
--- a/Spigot-Server-Patches/Activation-Range-Improvements.patch
+++ b/Spigot-Server-Patches/Activation-Range-Improvements.patch
@@ -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) {