Restore accidently reverted item in water fix

Spigot-Server-Patches/0426-Activation-Range-Improvements.patch

@@ -1,4 +1,4 @@
-From 9d6f3275a1d285294b152ba5abb3c0e36d467739 Mon Sep 17 00:00:00 2001
+From 5d149308c170326343337431e4c888a7b3284eb7 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
@@ -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 ) )
          {