diff --git a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/inventory/InstantBow.java b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/inventory/InstantBow.java index f8b957c66..2db87d845 100644 --- a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/inventory/InstantBow.java +++ b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/inventory/InstantBow.java @@ -29,7 +29,7 @@ import fr.neatmonster.nocheatplus.utilities.TickTask; */ public class InstantBow extends Check { - private static final float maxTime = 800f; + private static final float maxTime = 750f; /** * Instantiates a new instant bow check. diff --git a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/moving/model/ModelFlying.java b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/moving/model/ModelFlying.java index 146dd0e1f..81f393428 100644 --- a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/moving/model/ModelFlying.java +++ b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/moving/model/ModelFlying.java @@ -69,7 +69,7 @@ public class ModelFlying { */ private boolean scaleSlowfallingEffect = false; - /** + /** * Allow an extra amount to ascend speed, scaling with the riptiding effect * level. */ @@ -118,6 +118,14 @@ public class ModelFlying { scaleLevitationEffect(defaults.getScaleLevitationEffect()); // Config? scaleSlowfallingEffect(defaults.getScaleSlowfallingEffect()); scaleRiptidingEffect(defaults.getScaleRiptidingEffect()); + + // Only the resolved creative game-mode model gets the extra allowance. + // The first creative model is the defaults template; doubling that would + // also leak into survival/adventure allow-flight models. + if ("gamemode.creative".equals(id) && defaults.getId() != null) { + horizontalModSpeed(horizontalModSpeed * 2.0); + verticalAscendModSpeed(verticalAscendModSpeed * 2.0); + } } /** @@ -216,7 +224,6 @@ public class ModelFlying { return scaleRiptidingEffect; } - public ModelFlying horizontalModSpeed(double horizontalModSpeed) { checkLocked(); this.horizontalModSpeed = horizontalModSpeed;