fix bug

Author: xia-mc

src/main/java/top/infsky/cheatdetector/config/AdvancedConfig.java

@@ -143,13 +143,11 @@ public class AdvancedConfig {
     public static int autoClickerAMinDiffMs = 5;
 
     @Config(category = ConfigCategory.ADVANCED)
-    public static boolean flyCCheck = true;
+    public static boolean flyCCheck = false;
     @Config(category = ConfigCategory.ADVANCED)
     public static int flyCAlertBuffer = 30;
     @Config(category = ConfigCategory.ADVANCED)
-    public static double flyCMinDiffYMotion = 0.1;
-    @Config(category = ConfigCategory.ADVANCED)
-    public static int flyCMinRepeatTicks = 5;
+    public static int flyCMinRepeatTicks = 10;
 
     @Config(category = ConfigCategory.ADVANCED)
     public static boolean boatFlyACheck = true;

src/main/java/top/infsky/cheatdetector/impl/checks/movement/FlyA.java

@@ -13,10 +13,10 @@ public FlyA(@NotNull TRPlayer player) {
 
     @Override
     public void _onTick() {
-        if (player.fabricPlayer.isPassenger() || !PlayerMove.isMove(player.currentMotion)) return;
+        if (player.fabricPlayer.isPassenger() || !PlayerMove.isMove(player.currentMotion) || (player.currentOnGround && player.fabricPlayer.isFallFlying())) return;
 
         if (player.lastMotion.y() == 0 && player.currentMotion.y() == 0) {
-            flag("Invalid Y-motion.  onGround=%s".formatted(player.currentOnGround));
+            flag("Invalid Y-motion: %.2f  onGround=%s".formatted(player.currentMotion.y() , player.currentOnGround));
         }
     }
 

src/main/java/top/infsky/cheatdetector/impl/checks/movement/FlyC.java

@@ -2,6 +2,7 @@
 
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.phys.Vec3;
 import org.jetbrains.annotations.NotNull;
 import top.infsky.cheatdetector.config.AdvancedConfig;
 import top.infsky.cheatdetector.impl.Check;
@@ -22,16 +23,16 @@ public void _onTick() {
                 || IGNORED_BLOCKS.stream().anyMatch(block -> player.fabricPlayer.getFeetBlockState().is(block))) return;
 
         int repeatFromTick = 0;
-        for (int i = 0; i < player.motionHistory.size(); i++) {
-            if (Math.abs(player.motionHistory.get(i).y() - player.currentMotion.y()) >= AdvancedConfig.flyCMinDiffYMotion) {
+        for (Vec3 motion : player.motionHistory) {
+            if (motion.y() != player.currentMotion.y()) {
                 return;
             }
 
             repeatFromTick++;
         }
 
         if (repeatFromTick >= AdvancedConfig.flyCMinRepeatTicks) {
-            flag("Repeat Y-motion from %s ticks.".formatted(repeatFromTick));
+            flag("Repeat Y-motion from %s ticks: %.2f".formatted(repeatFromTick, player.currentMotion.y()));
         }
     }
 

src/main/java/top/infsky/cheatdetector/impl/checks/movement/MotionA.java

@@ -7,7 +7,6 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import top.infsky.cheatdetector.config.AdvancedConfig;
-import top.infsky.cheatdetector.config.AntiCheatConfig;
 import top.infsky.cheatdetector.impl.Check;
 import top.infsky.cheatdetector.impl.utils.world.BlockUtils;
 import top.infsky.cheatdetector.utils.TRPlayer;
@@ -54,8 +53,10 @@ public void _onTick() {
             if (tick >= 0) {
                 List<Double> possibleMotion = Objects.requireNonNull(getPossibleMotions(player));
 
-                if (Math.abs(player.currentMotion.y() - possibleMotion.get(tick)) > AntiCheatConfig.threshold) {
-                    flag("Invalid jump motion at tick %s.".formatted(tick));
+                double should = possibleMotion.get(tick);
+                double current = player.currentMotion.y();
+                if (Math.abs(current - should) > 0.01) {
+                    flag("Invalid jump motion at tick %s. should: %.2f  current: %.2f".formatted(tick, should, current));
                 }
             }
         } catch (IndexOutOfBoundsException ignored) {

src/main/java/top/infsky/cheatdetector/impl/modules/common/Debug.java

@@ -5,8 +5,7 @@
 import net.minecraft.network.Connection;
 import net.minecraft.network.protocol.Packet;
 import net.minecraft.network.protocol.game.ClientGamePacketListener;
-import net.minecraft.network.protocol.game.ClientboundEntityEventPacket;
-import net.minecraft.network.protocol.game.ClientboundGameEventPacket;
+import net.minecraft.network.protocol.game.ClientboundSetEntityMotionPacket;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@@ -31,11 +30,10 @@ public Debug(@NotNull TRSelf player) {
     public boolean _onPacketReceive(@NotNull Packet<ClientGamePacketListener> basePacket, Connection connection, ChannelHandlerContext channelHandlerContext, CallbackInfo ci) {
         if (isDisabled()) return false;
 
-        if (basePacket instanceof ClientboundEntityEventPacket packet) {
-            customMsg("EntityEvent: entity:%s eventId:%s".formatted(Objects.requireNonNull(packet.getEntity(LevelUtils.getClientLevel())).getName().getString(), packet.getEventId()));
-        }
-        if (basePacket instanceof ClientboundGameEventPacket packet) {
-            customMsg("GameEvent: event:%s param:%s".formatted(Objects.requireNonNull(packet.getEvent()), packet.getParam()));
+        if (basePacket instanceof ClientboundSetEntityMotionPacket packet) {
+            customMsg("SetMotion: entity:%s x:%.2f y:%.2f z:%.2f".formatted(
+                    Objects.requireNonNull(LevelUtils.getClientLevel().getEntity(packet.getId())).getName().getString(),
+                    ((double) packet.getXa()) / 8000, ((double) packet.getYa()) / 8000, ((double) packet.getZa()) / 8000));
         }
         return false;
     }