Merge remote-tracking branch 'origin/master'

Author: LongPPPP

anticheat/src/main/java/net/swofty/anticheat/engine/SwoftyPlayer.java

@@ -32,6 +32,11 @@ public class SwoftyPlayer {
     private long lastPingResponse;
     private final FlagManager flagManager;
 
+    // Player ability state (from AbilitiesPacket)
+    private boolean flying = false;
+    private boolean allowFlight = false;
+    private boolean creativeMode = false;
+
     public SwoftyPlayer(UUID uuid) {
         this.uuid = uuid;
         this.flagManager = new FlagManager(uuid, new HashMap<>());
@@ -142,4 +147,14 @@ public void processMovement(@NotNull Pos packetPosition, boolean onGround) {
     public void sendPacket(SwoftyPacket packet) {
         SwoftyAnticheat.getLoader().sendPacket(uuid, packet);
     }
+
+    public void updateAbilities(boolean flying, boolean allowFlight, boolean creativeMode) {
+        this.flying = flying;
+        this.allowFlight = allowFlight;
+        this.creativeMode = creativeMode;
+    }
+
+    public boolean shouldBypassMovementChecks() {
+        return flying || creativeMode || allowFlight;
+    }
 }

anticheat/src/main/java/net/swofty/anticheat/event/SwoftyEventHandler.java

@@ -32,7 +32,8 @@ public static void callEvent(Object event) {
             try {
                 entry.method.invoke(entry.instance, event);
             } catch (Exception e) {
-                Logger.error(e, "Failed to invoke event listener method {} for event {}",
+                Throwable cause = e.getCause() != null ? e.getCause() : e;
+                Logger.error(cause, "Failed to invoke event listener method {} for event {}",
                         entry.method.getName(), event.getClass().getSimpleName());
             }
         }

anticheat/src/main/java/net/swofty/anticheat/flag/FlagType.java

@@ -14,7 +14,6 @@ public enum FlagType {
     SPEED(SpeedFlag::new),
     FLIGHT(FlightFlag::new),
     TIMER(TimerFlag::new),
-    STRAFE(StrafeFlag::new),
     PHASE(PhaseFlag::new),
     JESUS(JesusFlag::new),
 

anticheat/src/main/java/net/swofty/anticheat/flag/flags/AimFlag.java

@@ -31,75 +31,12 @@ void addRotation(float yawChange, float pitchChange) {
 
     @ListenerMethod
     public void onPlayerPositionUpdate(PlayerPositionUpdateEvent event) {
-        if (event.getPreviousTick() == null) return;
-
-        Pos currentPos = event.getCurrentTick().getPos();
-        Pos previousPos = event.getPreviousTick().getPos();
-
-        float yawChange = Math.abs(currentPos.yaw() - previousPos.yaw());
-        float pitchChange = Math.abs(currentPos.pitch() - previousPos.pitch());
-
-        // Normalize yaw change (handle wrapping)
-        if (yawChange > 180) {
-            yawChange = 360 - yawChange;
-        }
-
-        UUID uuid = event.getPlayer().getUuid();
-        RotationData data = rotationData.computeIfAbsent(uuid, k -> new RotationData());
-        data.addRotation(yawChange, pitchChange);
-
-        if (data.yawChanges.size() < 10) return;
-
-        // Pattern 1: Impossible rotation speed (>180 degrees per tick is suspicious)
-        if (yawChange > 180 || pitchChange > 90) {
-            double certainty = Math.min(0.9, 0.6 + Math.max(yawChange, pitchChange) / 360.0);
-            event.getPlayer().flag(net.swofty.anticheat.flag.FlagType.AIM, certainty);
-        }
-
-        // Pattern 2: Perfect lock-on (no micro-adjustments)
-        // Human aim has small variations, aimbots lock perfectly
-        if (isStaticAim(data.yawChanges) && isStaticAim(data.pitchChanges)) {
-            event.getPlayer().flag(net.swofty.anticheat.flag.FlagType.AIM, 0.75);
-        }
-
-        // Pattern 3: Robotic patterns (same rotation amount repeatedly)
-        if (hasRoboticPattern(data.yawChanges) || hasRoboticPattern(data.pitchChanges)) {
-            event.getPlayer().flag(net.swofty.anticheat.flag.FlagType.AIM, 0.8);
-        }
+        // Disabled: heuristic-based detection has too many false positives
     }
 
     @ListenerMethod
     public void onPlayerAttack(PlayerAttackEvent event) {
-        // Check if player snapped to target
-        Pos attackerPos = event.getAttacker().getCurrentTick().getPos();
-        Pos targetPos = event.getTargetPosition();
-
-        // Calculate required look angle to hit target
-        Pos requiredLook = attackerPos.withLookAt(targetPos);
-
-        // Check how close the player's actual look is to perfect
-        float yawDiff = Math.abs(attackerPos.yaw() - requiredLook.yaw());
-        float pitchDiff = Math.abs(attackerPos.pitch() - requiredLook.pitch());
-
-        // Normalize yaw difference
-        if (yawDiff > 180) yawDiff = 360 - yawDiff;
-
-        // Perfect aim (within 0.5 degrees) every time is suspicious
-        if (yawDiff < 0.5 && pitchDiff < 0.5) {
-            UUID uuid = event.getAttacker().getUuid();
-            RotationData data = rotationData.get(uuid);
-
-            if (data != null && data.yawChanges.size() >= 5) {
-                // Check if last few rotations were also perfect
-                long perfectCount = data.yawChanges.stream()
-                    .filter(change -> change < 1.0)
-                    .count();
-
-                if (perfectCount >= 3) {
-                    event.getAttacker().flag(net.swofty.anticheat.flag.FlagType.AIM, 0.85);
-                }
-            }
-        }
+        // Disabled: heuristic-based detection has too many false positives
     }
 
     private boolean isStaticAim(List<Float> changes) {

anticheat/src/main/java/net/swofty/anticheat/flag/flags/BadPacketsFlag.java

@@ -22,78 +22,21 @@ private static class PacketData {
 
     @ListenerMethod
     public void onPlayerPositionUpdate(PlayerPositionUpdateEvent event) {
-        UUID uuid = event.getPlayer().getUuid();
-        PacketData data = packetData.computeIfAbsent(uuid, k -> new PacketData());
-
-        long currentTime = System.currentTimeMillis();
         Pos currentPos = event.getCurrentTick().getPos();
 
-        // Pattern 1: Packet spam (too many packets too quickly)
-        if (data.lastPacketTime > 0) {
-            long timeDiff = currentTime - data.lastPacketTime;
-
-            if (timeDiff < 10) { // Less than 10ms between packets
-                data.packetBurst++;
-
-                if (data.packetBurst > 5) {
-                    double certainty = Math.min(0.9, 0.5 + data.packetBurst * 0.05);
-                    event.getPlayer().flag(net.swofty.anticheat.flag.FlagType.BADPACKETS, certainty);
-                    data.packetBurst = 0; // Reset after flagging
-                }
-            } else if (timeDiff > 50) {
-                // Reset burst counter if normal timing
-                data.packetBurst = 0;
-            }
-        }
-
-        // Pattern 2: Duplicate position packets
-        if (data.lastPosition != null) {
-            if (isSamePosition(currentPos, data.lastPosition)) {
-                data.duplicatePackets++;
-
-                if (data.duplicatePackets > 10) {
-                    event.getPlayer().flag(net.swofty.anticheat.flag.FlagType.BADPACKETS, 0.7);
-                    data.duplicatePackets = 0;
-                }
-            } else {
-                data.duplicatePackets = 0;
-            }
-        }
-
-        // Pattern 3: Invalid rotation values
+        // Only check mathematically impossible values
         float pitch = currentPos.pitch();
         float yaw = currentPos.yaw();
 
+        // Invalid pitch (must be -90 to 90, anything else is impossible)
         if (pitch < -90 || pitch > 90) {
-            // Invalid pitch (should be clamped to -90 to 90)
-            event.getPlayer().flag(net.swofty.anticheat.flag.FlagType.BADPACKETS, 0.95);
+            event.getPlayer().flag(net.swofty.anticheat.flag.FlagType.BADPACKETS, 0.99);
         }
 
+        // NaN or Infinite values are impossible
         if (Float.isNaN(pitch) || Float.isNaN(yaw) || Float.isInfinite(pitch) || Float.isInfinite(yaw)) {
-            // Invalid float values
             event.getPlayer().flag(net.swofty.anticheat.flag.FlagType.BADPACKETS, 0.99);
         }
-
-        // Pattern 4: Position teleportation (large instant movement)
-        if (data.lastPosition != null && event.getPreviousTick() != null) {
-            double distance = calculateDistance(currentPos, data.lastPosition);
-
-            // More than 10 blocks in one tick without proper velocity is suspicious
-            // (Could be legitimate teleport, but packets should reflect that)
-            if (distance > 10) {
-                Vel vel = event.getCurrentTick().getVel();
-                double velocityMagnitude = Math.sqrt(vel.x() * vel.x() + vel.y() * vel.y() + vel.z() * vel.z());
-
-                // If movement is large but velocity is small, packets are malformed
-                if (velocityMagnitude < 1.0) {
-                    double certainty = Math.min(0.85, 0.4 + (distance / 50.0));
-                    event.getPlayer().flag(net.swofty.anticheat.flag.FlagType.BADPACKETS, certainty);
-                }
-            }
-        }
-
-        data.lastPacketTime = currentTime;
-        data.lastPosition = currentPos;
     }
 
     @ListenerMethod

anticheat/src/main/java/net/swofty/anticheat/flag/flags/FlightFlag.java

@@ -1,9 +1,13 @@
 package net.swofty.anticheat.flag.flags;
 
 import net.swofty.anticheat.engine.PlayerTickInformation;
+import net.swofty.anticheat.engine.SwoftyPlayer;
 import net.swofty.anticheat.event.ListenerMethod;
+import net.swofty.anticheat.event.events.AnticheatPacketEvent;
 import net.swofty.anticheat.event.events.PlayerPositionUpdateEvent;
+import net.swofty.anticheat.event.packet.AbilitiesPacket;
 import net.swofty.anticheat.flag.Flag;
+import net.swofty.anticheat.flag.FlagType;
 import net.swofty.anticheat.math.Vel;
 
 public class FlightFlag extends Flag {
@@ -13,53 +17,49 @@ public class FlightFlag extends Flag {
     private static final double DRAG = 0.98; // Air resistance
 
     @ListenerMethod
-    public void onPlayerPositionUpdate(PlayerPositionUpdateEvent event) {
-        PlayerTickInformation currentTick = event.getCurrentTick();
-        PlayerTickInformation previousTick = event.getPreviousTick();
-
-        if (previousTick == null) return;
-
-        boolean onGround = currentTick.isOnGround();
-        boolean wasOnGround = previousTick.isOnGround();
-
-        Vel currentVel = currentTick.getVel();
-        Vel previousVel = previousTick.getVel();
-
-        double currentY = currentVel.y();
-        double previousY = previousVel.y();
-
-        // Pattern 1: Hovering (staying at same Y without being on ground)
-        if (!onGround && Math.abs(currentY) < 0.01 && Math.abs(previousY) < 0.01) {
-            event.getPlayer().flag(net.swofty.anticheat.flag.FlagType.FLIGHT, 0.85);
-            return;
+    public void onPacket(AnticheatPacketEvent event) {
+        if (event.getPacket() instanceof AbilitiesPacket abilities) {
+            SwoftyPlayer player = SwoftyPlayer.players.get(abilities.getPlayer().getUuid());
+            if (player != null) {
+                player.updateAbilities(abilities.isFlying(), abilities.isAllowFlight(), abilities.isCreativeMode());
+            }
         }
+    }
+
+    @ListenerMethod
+    public void onPlayerPositionUpdate(PlayerPositionUpdateEvent event) {
+        SwoftyPlayer player = event.getPlayer();
 
-        // Pattern 2: Ascending without jump (not on ground, moving up without initial jump velocity)
-        if (!onGround && !wasOnGround && currentY > 0 && currentY > previousY * DRAG) {
-            // Velocity should be decreasing due to gravity, not increasing
-            double certainty = Math.min(0.9, 0.6 + Math.abs(currentY - previousY * DRAG) * 5);
-            event.getPlayer().flag(net.swofty.anticheat.flag.FlagType.FLIGHT, certainty);
+        // Skip checks for players with flight abilities
+        if (player.shouldBypassMovementChecks()) {
             return;
         }
 
-        // Pattern 3: Ignoring gravity (velocity not decreasing as expected)
-        if (!onGround && !wasOnGround) {
-            // Expected Y velocity with gravity
-            double expectedY = (previousY + GRAVITY) * DRAG;
-            double difference = Math.abs(currentY - expectedY);
+        Vel currentVel = event.getCurrentTick().getVel();
+        boolean onGround = event.getCurrentTick().isOnGround();
 
-            // Allow some tolerance for server/client lag
-            if (difference > 0.1) {
-                double certainty = Math.min(0.95, 0.5 + difference * 3);
-                event.getPlayer().flag(net.swofty.anticheat.flag.FlagType.FLIGHT, certainty);
+        // Check for impossible upward velocity when not on ground
+        // Normal jump velocity is ~0.42, anything significantly higher is suspicious
+        if (!onGround && currentVel.y() > MAX_VERTICAL_SPEED * 1.5) {
+            int airTicks = countAirTicks(player.getLastTicks());
+            // After a few ticks in the air, upward velocity should be impossible without flying
+            if (airTicks > 5) {
+                player.flag(FlagType.FLIGHT, 0.9);
             }
         }
 
-        // Pattern 4: Multiple ticks in air with no Y velocity change
-        int airTicks = countAirTicks(event.getPlayer().getLastTicks());
-        if (airTicks > 5 && Math.abs(currentY) < 0.05) {
-            double certainty = Math.min(0.95, 0.4 + (airTicks * 0.05));
-            event.getPlayer().flag(net.swofty.anticheat.flag.FlagType.FLIGHT, certainty);
+        // Check for sustained horizontal flight (no gravity effect)
+        if (!onGround) {
+            int airTicks = countAirTicks(player.getLastTicks());
+            // If in the air for many ticks without falling, likely flying
+            if (airTicks >= 15) {
+                // Check if Y velocity is suspiciously stable (not affected by gravity)
+                double avgYVel = calculateAverageYVelocity(player.getLastTicks(), 10);
+                if (avgYVel > -0.01 && avgYVel < 0.01) {
+                    // Hovering in place - very suspicious
+                    player.flag(FlagType.FLIGHT, 0.85);
+                }
+            }
         }
     }
 
@@ -74,4 +74,15 @@ private int countAirTicks(java.util.List<PlayerTickInformation> ticks) {
         }
         return count;
     }
+
+    private double calculateAverageYVelocity(java.util.List<PlayerTickInformation> ticks, int count) {
+        if (ticks.isEmpty()) return 0;
+        double sum = 0;
+        int actualCount = 0;
+        for (int i = ticks.size() - 1; i >= 0 && actualCount < count; i--) {
+            sum += ticks.get(i).getVel().y();
+            actualCount++;
+        }
+        return actualCount > 0 ? sum / actualCount : 0;
+    }
 }

anticheat/src/main/java/net/swofty/anticheat/flag/flags/OnGroundSpoofFlag.java

@@ -9,56 +9,7 @@
 public class OnGroundSpoofFlag extends Flag {
     @ListenerMethod
     public void onPlayerPositionUpdate(PlayerPositionUpdateEvent event) {
-        boolean packetOnGround = event.getCurrentTick().isOnGround();
-        Vel currentVel = event.getCurrentTick().getVel();
-        Pos currentPosition = event.getCurrentTick().getPos();
-
-        // Determine if player is truly on ground by checking Y velocity and position
-        boolean trueOnGround = false;
-
-        // Pattern 1: Y velocity near zero indicates on ground
-        if (Math.abs(currentVel.y()) < 0.01) {
-            trueOnGround = true;
-        }
-
-        // Pattern 2: Check previous tick Y velocity pattern
-        if (event.getPreviousTick() != null) {
-            Vel previousVel = event.getPreviousTick().getVel();
-
-            // If Y velocity is consistent with being on ground (not falling/jumping)
-            if (Math.abs(currentVel.y()) < 0.1 && Math.abs(previousVel.y()) < 0.5) {
-                trueOnGround = true;
-            }
-
-            // If player was falling and suddenly stopped, they're on ground
-            if (previousVel.y() < -0.1 && Math.abs(currentVel.y()) < 0.01) {
-                trueOnGround = true;
-            }
-        }
-
-        // Pattern 3: Check if Y position is on a block boundary
-        double yFraction = currentPosition.y() - Math.floor(currentPosition.y());
-        if (yFraction < 0.01 || yFraction > 0.99) {
-            // Y position suggests standing on block
-            trueOnGround = true;
-        }
-
-        // Now compare packet claim vs reality
-        if (packetOnGround && !trueOnGround) {
-            // Client claims on ground but isn't
-            // This is used by some fly hacks to avoid fall damage
-            double certainty = 0.75;
-
-            // Higher certainty if player is high in the air
-            if (Math.abs(currentVel.y()) > 0.3) {
-                certainty = 0.9;
-            }
-
-            event.getPlayer().flag(net.swofty.anticheat.flag.FlagType.ON_GROUND_SPOOF, certainty);
-        } else if (!packetOnGround && trueOnGround) {
-            // Client claims not on ground but is
-            // Less severe but still suspicious (could be used for some exploits)
-            event.getPlayer().flag(net.swofty.anticheat.flag.FlagType.ON_GROUND_SPOOF, 0.6);
-        }
+        // Disabled: heuristic-based detection has too many false positives
+        // Needs actual collision checking against world blocks to be accurate
     }
 }