Elytra before levitation.

NoCheatPlus · May 6, 2017 · 8c6ebba · 8c6ebba
1 parent bfaa71f
commit 8c6ebba
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/moving/MovingConfig.java b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/moving/MovingConfig.java
@@ -466,15 +466,15 @@ public ModelFlying getModelFlying(final Player player, final PlayerLocation from
         if (player.isFlying() || !isGlidingWithElytra && !ignoreAllowFlight && player.getAllowFlight()) {
             return modelGameMode;
         }
+        // Elytra.
+        if (isGlidingWithElytra) { // Defensive: don't demand isGliding.
+            return flyingModelElytra;
+        }
         // Levitation.
         if (gameMode != GameMode.CREATIVE && !Double.isInfinite(Bridge1_9.getLevitationAmplifier(player))
                 && !fromLocation.isInLiquid()) {
             return flyingModelLevitation;
         }
-        // Elytra.
-        if (isGlidingWithElytra) { // Defensive: don't demand isGliding.
-            return flyingModelElytra;
-        }
         // Default by game mode.
         return modelGameMode;
     }

diff --git a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/moving/util/MovingUtil.java b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/moving/util/MovingUtil.java
@@ -88,9 +88,10 @@ public static final boolean shouldCheckSurvivalFly(final Player player, final Pl
                 && (cc.ignoreCreative || gameMode != GameMode.CREATIVE) && !player.isFlying() 
                 && (cc.ignoreAllowFlight || !player.getAllowFlight())
                 && !NCPExemptionManager.isExempted(player, CheckType.MOVING_SURVIVALFLY, true)
-                && (Double.isInfinite(Bridge1_9.getLevitationAmplifier(player)) || fromLocation.isInLiquid())
                 && (!Bridge1_9.isGlidingWithElytra(player) 
                         || !isGlidingWithElytraValid(player, fromLocation, data, cc))
+                && (Double.isInfinite(Bridge1_9.getLevitationAmplifier(player)) 
+                        || fromLocation.isInLiquid())
                 && !player.hasPermission(Permissions.MOVING_SURVIVALFLY);
     }