Only count in depth strider with water.

NoCheatPlus · Nov 8, 2015 · 5d4c71e · 5d4c71e
1 parent eef50d0
commit 5d4c71e
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/moving/SurvivalFly.java b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/moving/SurvivalFly.java
@@ -606,12 +606,14 @@ else if (from.isInLiquid() && to.isInLiquid()) {
             // TODO: Test how to go with only checking from (less dolphins).
             // TODO: Sneaking and blocking applies to when in water !
             hAllowedDistance = modSwim * walkSpeed * cc.survivalFlySwimmingSpeed / 100D;
-            final int level = BridgeEnchant.getDepthStriderLevel(player);
-            if (level > 0) {
-                // The hard way.
-                hAllowedDistance *= modDepthStrider[level];
-                // Modifiers: Most speed seems to be reached on ground, but couldn't nail down.
-                useBaseModifiers = true;
+            if (from.isInWater() || !from.isInLava()) { // (We don't really have other liquids, though.)
+                final int level = BridgeEnchant.getDepthStriderLevel(player);
+                if (level > 0) {
+                    // The hard way.
+                    hAllowedDistance *= modDepthStrider[level];
+                    // Modifiers: Most speed seems to be reached on ground, but couldn't nail down.
+                    useBaseModifiers = true;
+                }
             }
             // (Friction is used as is.)
         }