修复速度buff误判

fix speed
Nova-Committee · Apr 5, 2024 · 819b050 · 819b050
1 parent 3765f7f
commit 819b050
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/src/main/java/top/infsky/cheatdetector/anticheat/TRPlayer.java b/src/main/java/top/infsky/cheatdetector/anticheat/TRPlayer.java
@@ -3,6 +3,7 @@
 import lombok.Getter;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.player.AbstractClientPlayer;
+import net.minecraft.world.effect.MobEffects;
 import net.minecraft.world.phys.Vec3;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Range;
@@ -31,6 +32,7 @@ public class TRPlayer {
     public boolean hasSetback = false;
     public boolean jumping = false;
     public boolean lastUsingItem = false;
+    public double speedMul = 1;
 
     public TimeTaskManager timeTask = new TimeTaskManager();
 
@@ -50,6 +52,9 @@ public void update(AbstractClientPlayer player) {
         if (fabricPlayer == null) return;
 
         currentPos = fabricPlayer.position();
+        speedMul = fabricPlayer.getActiveEffectsMap().containsKey(MobEffects.MOVEMENT_SPEED)
+                ? fabricPlayer.getActiveEffectsMap().get(MobEffects.MOVEMENT_SPEED).getAmplifier() * 0.2 + 1
+                : 1;
         updatePoses();
         if (fabricPlayer.onGround()) {
             lastOnGroundPos = currentPos;

diff --git a/src/main/java/top/infsky/cheatdetector/anticheat/checks/NoSlowA.java b/src/main/java/top/infsky/cheatdetector/anticheat/checks/NoSlowA.java
@@ -34,7 +34,7 @@ public void _onTick() {
 
         final double secSpeed = PlayerMove.getXzSecSpeed(player.lastPos, player.currentPos);
 
-        if (secSpeed > SLOW_SPEED.get(itemUseTick) * (1 + player.fabricPlayer.getSpeed()) + CONFIG().getThreshold()) {
+        if (secSpeed > SLOW_SPEED.get(itemUseTick) * player.speedMul + CONFIG().getThreshold()) {
             flag();
         }
         if (itemUseTick < SLOW_SPEED.size() - 1) itemUseTick++;

diff --git a/src/main/java/top/infsky/cheatdetector/anticheat/checks/SpeedA.java b/src/main/java/top/infsky/cheatdetector/anticheat/checks/SpeedA.java
@@ -38,7 +38,7 @@ else if (player.fabricPlayer.isSilent())
             maxSecSpeed = 4.317;
 
         final double speed = PlayerMove.getXzSecSpeed(player.lastPos, player.currentPos);
-        if (speed > (maxSecSpeed * (1 + player.fabricPlayer.getSpeed()) + CONFIG().getThreshold())) {
+        if (speed > (maxSecSpeed * player.speedMul + CONFIG().getThreshold())) {
             flag(String.valueOf(speed));
         }
     }