From 0fe398c233ed417bad7c7fafe5cfc5258aa12461 Mon Sep 17 00:00:00 2001
From: asofold <asofold@web.de>
Date: Wed, 9 Dec 2015 10:38:04 +0100
Subject: [PATCH] Confine PaperSpigot workaround by jumpphase instead of
 hDistance.

---
 .../fr/neatmonster/nocheatplus/checks/moving/SurvivalFly.java | 4 ++--
 1 file changed, 2 insertions(+), 2 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
index d20fdab9..52b0e952 100644
--- a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/moving/SurvivalFly.java
+++ b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/moving/SurvivalFly.java
@@ -1018,8 +1018,8 @@ public class SurvivalFly extends Check {
                 if (yDistance > cc.sfStepHeight || !tags.contains("lostground_couldstep")) {
                     if (data.getOrUseVerticalVelocity(yDistance) == null) {
                         // Last minute special case.
-                        if (data.lastYDist == Double.MAX_VALUE && hDistance == 0.0 
-                                && yDistance > 0.0 && yDistance < 0.000000005 && Math.abs(totalVDistViolation) < 0.000000005
+                        if (data.lastYDist == Double.MAX_VALUE && data.sfJumpPhase == 0
+                                && Math.abs(totalVDistViolation) < 0.000000005 && yDistance > 0.0 && yDistance < 0.000000005 
                                 && !resetFrom && !resetTo && !data.noFallAssumeGround
                                 ) {
                             // Special case after teleport to in-air (PaperSpigot, might confine further by server type/version).