From f85236afd3cbcdb3eb1ef75d8d958124880eebbf Mon Sep 17 00:00:00 2001
From: Dawson <30784509+funkemunky@users.noreply.github.com>
Date: Tue, 21 Feb 2023 12:36:13 -0500
Subject: [PATCH] Fixed Speed falsing on jump

---
 .../ac/check/impl/movement/speed/Speed.java   | 21 +++++++++++++------
 .../java/dev/brighten/ac/utils/KLocation.java |  7 +++++++
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/main/java/dev/brighten/ac/check/impl/movement/speed/Speed.java b/src/main/java/dev/brighten/ac/check/impl/movement/speed/Speed.java
index 5b3d6dc..ce013ba 100644
--- a/src/main/java/dev/brighten/ac/check/impl/movement/speed/Speed.java
+++ b/src/main/java/dev/brighten/ac/check/impl/movement/speed/Speed.java
@@ -7,15 +7,17 @@ import dev.brighten.ac.check.WAction;
 import dev.brighten.ac.data.APlayer;
 import dev.brighten.ac.packet.ProtocolVersion;
 import dev.brighten.ac.packet.wrapper.in.WPacketPlayInFlying;
+import dev.brighten.ac.utils.BlockUtils;
 import dev.brighten.ac.utils.PlayerUtils;
 import dev.brighten.ac.utils.TagsBuilder;
+import dev.brighten.ac.utils.XMaterial;
 import org.bukkit.potion.PotionEffectType;
 
 @CheckData(name = "Speed", checkId = "speeda", type = CheckType.MOVEMENT)
 public class Speed extends Check {
 
     private double ldxz = .12f;
-    private float friction = 0.91f;
+    private float friction = 0.6f;
     private float buffer;
 
     WAction<WPacketPlayInFlying> flying = packet -> {
@@ -28,9 +30,9 @@ public class Speed extends Check {
             float drag = friction;
 
             TagsBuilder tags = new TagsBuilder();
-            double moveFactor = player.getBukkitPlayer().getWalkSpeed() / 2f;
+            float moveFactor = player.getBukkitPlayer().getWalkSpeed() / 2f;
 
-            moveFactor+= moveFactor * 0.3f;
+            moveFactor+= moveFactor * 0.30000001192092896D;
 
             if(player.getPotionHandler().hasPotionEffect(PotionEffectType.SPEED))
                 moveFactor += (PlayerUtils.getPotionEffectLevel(player.getBukkitPlayer(), PotionEffectType.SPEED)
@@ -47,7 +49,7 @@ public class Speed extends Check {
 
                 if (player.getMovement().isJumped()) {
                     tags.addTag("jumped");
-                    moveFactor += 0.2;
+                    moveFactor += 0.2f;
                 }
             } else {
                 tags.addTag("air");
@@ -59,7 +61,7 @@ public class Speed extends Check {
                 tags.addTag("water");
 
                 drag = player.getPlayerVersion().isOrAbove(ProtocolVersion.V1_13) ? 0.9f : 0.8f;
-                moveFactor = 0.034;
+                moveFactor = 0.034f;
 
                 if(player.getInfo().lastLiquid.getResetStreak() < 3) {
                     tags.addTag("water-enter");
@@ -118,6 +120,7 @@ public class Speed extends Check {
                             player.getMovement().getGroundTicks(),
                             player.EMULATOR.getInput().getAiMoveSpeed(), tags.build());
                     buffer = Math.min(5, buffer); //Preventing runaway flagging
+                    cancel();
                 } else if(ratio > 250) {
                     cancel();
                     debug("Cancelled user movement: %.1f", ratio);
@@ -128,7 +131,13 @@ public class Speed extends Check {
 
             ldxz = player.getMovement().getDeltaXZ() * drag;
         }
-        friction = player.EMULATOR.getFriction();
+        friction = BlockUtils
+                .getFriction(
+                        BlockUtils.getBlockAsync(player.getMovement()
+                                .getTo().getLoc().clone().subtract(0, 1, 0).toLocation(
+                                        player.getBukkitPlayer().getWorld()))
+                                .map(b -> XMaterial.matchXMaterial(b.getType()))
+                                .orElse(XMaterial.STONE));
     };
 
     public Speed(APlayer player) {
diff --git a/src/main/java/dev/brighten/ac/utils/KLocation.java b/src/main/java/dev/brighten/ac/utils/KLocation.java
index 8437a17..732f68c 100644
--- a/src/main/java/dev/brighten/ac/utils/KLocation.java
+++ b/src/main/java/dev/brighten/ac/utils/KLocation.java
@@ -76,6 +76,13 @@ public class KLocation implements Cloneable {
         return this;
     }
 
+    public KLocation subtract(double x, double y, double z) {
+        this.x-= x;
+        this.y-= y;
+        this.z-= z;
+        return this;
+    }
+
     public KLocation setLocation(KLocation loc) {
         this.x = loc.x;
         this.y = loc.y;