From 89718e929a2192eba4e6872ea61d96f492703e09 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 2 Apr 2020 23:12:21 -0400
Subject: [PATCH] Restore accidently reverted item in water fix

---
 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 8f63c27ff8..935a6ede71 100644
--- a/Spigot-Server-Patches/Activation-Range-Improvements.patch
+++ b/Spigot-Server-Patches/Activation-Range-Improvements.patch
@@ -34,7 +34,7 @@ index d522d7238d..3a248dbe37 100644
                  this.setMot(Vec3D.a);
              }
 +            // Paper start - ignore movement changes while inactive.
-+            if (isTemporarilyActive && vec3d == getMot() && enummovetype == EnumMoveType.SELF) {
++            if (isTemporarilyActive && !(this instanceof EntityItem) && vec3d == getMot() && enummovetype == EnumMoveType.SELF) {
 +                setMot(Vec3D.a);
 +                return;
 +            }
@@ -349,7 +349,7 @@ index 92601c581c..f4cb669740 100644
 +        if ( (entity.activationType != ActivationType.WATER && entity.inWater && entity.pushedByWater()) || entity.fireTicks > 0 ) // Paper
          {
 -            return true;
-+            return 1; // Paper
++            return 100; // Paper
          }
          if ( !( entity instanceof EntityArrow ) )
          {