From addebee9955a78fcfc31f73dbd0957625b2c65d6 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
---
 .../0115-Activation-Range-Improvements.patch                | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Spigot-Server-Patches/0115-Activation-Range-Improvements.patch b/Spigot-Server-Patches/0115-Activation-Range-Improvements.patch
index 1e57afe27..b10665ed9 100644
--- a/Spigot-Server-Patches/0115-Activation-Range-Improvements.patch
+++ b/Spigot-Server-Patches/0115-Activation-Range-Improvements.patch
@@ -1,4 +1,4 @@
-From 49e4bf33f5be44524fb07c642291336604a8e64e Mon Sep 17 00:00:00 2001
+From 4504fed8cc5a75b0c8c10ebb12bcb840d6d51973 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 13 May 2016 01:38:06 -0400
 Subject: [PATCH] Activation Range Improvements
@@ -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
 @@ -2,6 +2,8 @@ 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) {