Merge branch 'GrimAnticheat:2.0' into 2.0

Anthony01M · web-flow · commit 0e8a872afe62 · 2024-06-09T02:33:32.000+03:00
diff --git a/SECURITY.md b/SECURITY.md
@@ -2,8 +2,8 @@
 
 ## Supported Versions
 
-Vulnerability must be reproducable on the latest grim version on spigotmc or newer.
+Vulnerability must be reproducible on the latest grim commit.
 
 ## Reporting a Vulnerability
 
-If there's a major bypass that would affect gameplay if reported publicly then join Grim's discord [here](https://discord.com/invite/FNRrcGAybJ) and message DefineOutside.
+If there's a major bypass that would affect gameplay if reported publicly then join Grim's discord [here](https://discord.com/invite/kqQAhTmkUF) and reach out to staff.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -10,7 +10,7 @@ plugins {
 
 
 group = "ac.grim.grimac"
-version = "2.3.64"
+version = "2.3.65"
 description = "Libre simulation anticheat designed for 1.20 with 1.8-1.20 support, powered by PacketEvents 2.0."
 java.sourceCompatibility = JavaVersion.VERSION_1_8
 java.targetCompatibility = JavaVersion.VERSION_1_8
diff --git a/src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsZ.java b/src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsZ.java
@@ -19,8 +19,8 @@ public BadPacketsZ(final GrimPlayer player) {
         super(player);
     }
 
-    private boolean exemptNextFinish = false;
-    private Vector3i lastBlock, lastLastBlock = null;
+    private boolean lastBlockWasInstantBreak = false;
+    private Vector3i lastBlock, lastCancelledBlock, lastLastBlock = null;
     private final int exemptedY = player.getClientVersion().isNewerThanOrEquals(ClientVersion.V_1_8) ? 4095 : 255;
 
     // The client sometimes sends a wierd cancel packet
@@ -47,51 +47,59 @@ private String formatted(Vector3i vec) {
 
     public void handle(PacketReceiveEvent event, WrapperPlayClientPlayerDigging dig) {
         if (dig.getAction() == DiggingAction.START_DIGGING) {
-            lastLastBlock = lastBlock;
-            lastBlock = dig.getBlockPosition();
+            final Vector3i pos = dig.getBlockPosition();
 
-            exemptNextFinish = player.getClientVersion().isNewerThanOrEquals(ClientVersion.V_1_14_4) && getBlockDamage(player, lastBlock) >= 1;
-            return;
+            lastBlockWasInstantBreak = getBlockDamage(player, pos) >= 1;
+            lastCancelledBlock = null;
+            lastLastBlock = lastBlock;
+            lastBlock = pos;
         }
 
         if (dig.getAction() == DiggingAction.CANCELLED_DIGGING) {
-            if (shouldExempt(dig.getBlockPosition())) {
+            final Vector3i pos = dig.getBlockPosition();
+
+            if (shouldExempt(pos)) {
+                lastCancelledBlock = null;
                 lastLastBlock = null;
                 lastBlock = null;
                 return;
             }
 
-            exemptNextFinish = false;
-
-            if ((lastBlock == null || !lastBlock.equals(dig.getBlockPosition())) && (lastLastBlock == null || !lastLastBlock.equals(dig.getBlockPosition()))) {
-                if (flagAndAlert("action=CANCELLED_DIGGING, last=" + formatted(lastBlock) + "/" + formatted(lastLastBlock) + ", pos=" + formatted(dig.getBlockPosition()))) {
-                    if (shouldModifyPackets()) {
-                        event.setCancelled(true);
-                        player.onPacketCancel();
+            if (!pos.equals(lastBlock)) {
+                // https://github.com/GrimAnticheat/Grim/issues/1512
+                if (player.getClientVersion().isOlderThan(ClientVersion.V_1_14_4) || (!lastBlockWasInstantBreak && pos.equals(lastCancelledBlock))) {
+                    if (flagAndAlert("action=CANCELLED_DIGGING" + ", last=" + formatted(lastBlock) + ", pos=" + formatted(pos))) {
+                        if (shouldModifyPackets()) {
+                            event.setCancelled(true);
+                            player.onPacketCancel();
+                            resyncPosition(player, pos);
+                        }
                     }
                 }
             }
 
+            lastCancelledBlock = pos;
             lastLastBlock = null;
             lastBlock = null;
+            return;
         }
 
         if (dig.getAction() == DiggingAction.FINISHED_DIGGING) {
-            if (exemptNextFinish) {
-                exemptNextFinish = false;
-                return;
-            }
+            final Vector3i pos = dig.getBlockPosition();
 
-            if ((lastBlock == null || !lastBlock.equals(dig.getBlockPosition())) && (lastLastBlock == null || !lastLastBlock.equals(dig.getBlockPosition()))) {
-                if (flagAndAlert("action=FINISHED_DIGGING, last=" + formatted(lastBlock) + "/" + formatted(lastLastBlock) + ", pos=" + formatted(dig.getBlockPosition()))) {
+            // when a player looks away from the mined block, they send a cancel, and if they look at it again, they don't send another start. (thanks mojang!)
+            if (!pos.equals(lastCancelledBlock) && (!lastBlockWasInstantBreak || player.getClientVersion().isOlderThan(ClientVersion.V_1_14_4)) && !pos.equals(lastBlock)) {
+                if (flagAndAlert("action=FINISHED_DIGGING" + ", last=" + formatted(lastBlock) + ", pos=" + formatted(pos))) {
                     if (shouldModifyPackets()) {
                         event.setCancelled(true);
                         player.onPacketCancel();
-                        resyncPosition(player, dig.getBlockPosition());
+                        resyncPosition(player, pos);
                     }
                 }
             }
 
+            lastCancelledBlock = null;
+
             // 1.14.4+ clients don't send another start break in protected regions
             if (player.getClientVersion().isOlderThan(ClientVersion.V_1_14_4)) {
                 lastLastBlock = null;
diff --git a/src/main/java/ac/grim/grimac/checks/impl/combat/Reach.java b/src/main/java/ac/grim/grimac/checks/impl/combat/Reach.java
@@ -21,6 +21,7 @@
 import ac.grim.grimac.player.GrimPlayer;
 import ac.grim.grimac.utils.collisions.datatypes.SimpleCollisionBox;
 import ac.grim.grimac.utils.data.packetentity.PacketEntity;
+import ac.grim.grimac.utils.data.packetentity.dragon.PacketEntityEnderDragonPart;
 import ac.grim.grimac.utils.nmsutil.ReachUtils;
 import com.github.retrooper.packetevents.event.PacketReceiveEvent;
 import com.github.retrooper.packetevents.protocol.entity.type.EntityType;
@@ -68,7 +69,8 @@ public void onPacketReceive(final PacketReceiveEvent event) {
 
             PacketEntity entity = player.compensatedEntities.entityMap.get(action.getEntityId());
             // Stop people from freezing transactions before an entity spawns to bypass reach
-            if (entity == null) {
+            // TODO: implement dragon parts?
+            if (entity == null || entity instanceof PacketEntityEnderDragonPart) {
                 // Only cancel if and only if we are tracking this entity
                 // This is because we don't track paintings.
                 if (shouldModifyPackets() && player.compensatedEntities.serverPositionsMap.containsKey(action.getEntityId())) {
@@ -140,7 +142,6 @@ private boolean isKnownInvalid(PacketEntity reachEntity) {
     private void tickBetterReachCheckWithAngle() {
         for (Map.Entry<Integer, Vector3d> attack : playerAttackQueue.entrySet()) {
             PacketEntity reachEntity = player.compensatedEntities.entityMap.get(attack.getKey().intValue());
-
             if (reachEntity != null) {
                 String result = checkReach(reachEntity, attack.getValue(), false);
                 if (result != null) {
diff --git a/src/main/java/ac/grim/grimac/checks/impl/misc/FastBreak.java b/src/main/java/ac/grim/grimac/checks/impl/misc/FastBreak.java
@@ -28,7 +28,7 @@
 
 // Based loosely off of Hawk BlockBreakSpeedSurvival
 // Also based loosely off of NoCheatPlus FastBreak
-// Also based off minecraft wiki: https://minecraft.fandom.com/wiki/Breaking#Instant_breaking
+// Also based off minecraft wiki: https://minecraft.wiki/w/Breaking#Instant_breaking
 @CheckData(name = "FastBreak", experimental = false)
 public class FastBreak extends Check implements PacketCheck {
     public FastBreak(GrimPlayer playerData) {
diff --git a/src/main/java/ac/grim/grimac/utils/data/packetentity/dragon/DragonPart.java b/src/main/java/ac/grim/grimac/utils/data/packetentity/dragon/DragonPart.java
@@ -0,0 +1,9 @@
+package ac.grim.grimac.utils.data.packetentity.dragon;
+
+public enum DragonPart {
+    HEAD,
+    NECK,
+    BODY,
+    TAIL,
+    WING
+}
diff --git a/src/main/java/ac/grim/grimac/utils/data/packetentity/dragon/PacketEntityEnderDragon.java b/src/main/java/ac/grim/grimac/utils/data/packetentity/dragon/PacketEntityEnderDragon.java
@@ -0,0 +1,34 @@
+package ac.grim.grimac.utils.data.packetentity.dragon;
+
+import ac.grim.grimac.player.GrimPlayer;
+import ac.grim.grimac.utils.data.packetentity.PacketEntity;
+import com.github.retrooper.packetevents.protocol.entity.type.EntityTypes;
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public final class PacketEntityEnderDragon extends PacketEntity {
+
+    private final List<PacketEntityEnderDragonPart> parts = new ArrayList<>();
+
+    public PacketEntityEnderDragon(GrimPlayer player, int entityID, double x, double y, double z) {
+        super(player, EntityTypes.ENDER_DRAGON, x, y, z);
+        final Int2ObjectOpenHashMap<PacketEntity> entityMap = player.compensatedEntities.entityMap;
+        parts.add(new PacketEntityEnderDragonPart(player, DragonPart.HEAD, x, y, z, 1.0F, 1.0F));
+        parts.add(new PacketEntityEnderDragonPart(player, DragonPart.NECK, x, y, z, 3.0F, 3.0F));
+        parts.add(new PacketEntityEnderDragonPart(player, DragonPart.BODY, x, y, z, 5.0F, 3.0F));
+        parts.add(new PacketEntityEnderDragonPart(player, DragonPart.TAIL, x, y, z, 2.0F, 2.0F));
+        parts.add(new PacketEntityEnderDragonPart(player, DragonPart.TAIL, x, y, z, 2.0F, 2.0F));
+        parts.add(new PacketEntityEnderDragonPart(player, DragonPart.TAIL, x, y, z, 2.0F, 2.0F));
+        parts.add(new PacketEntityEnderDragonPart(player, DragonPart.WING, x, y, z, 4.0F, 2.0F));
+        parts.add(new PacketEntityEnderDragonPart(player, DragonPart.WING, x, y, z, 4.0F, 2.0F));
+        for (int i = 1; i < parts.size() + 1; i++) {
+            entityMap.put(entityID + i, parts.get(i - 1));
+        }
+    }
+
+    public List<PacketEntityEnderDragonPart> getParts() {
+        return parts;
+    }
+}
diff --git a/src/main/java/ac/grim/grimac/utils/data/packetentity/dragon/PacketEntityEnderDragonPart.java b/src/main/java/ac/grim/grimac/utils/data/packetentity/dragon/PacketEntityEnderDragonPart.java
@@ -0,0 +1,30 @@
+package ac.grim.grimac.utils.data.packetentity.dragon;
+
+import ac.grim.grimac.player.GrimPlayer;
+import ac.grim.grimac.utils.data.packetentity.PacketEntity;
+import com.github.retrooper.packetevents.protocol.entity.type.EntityTypes;
+
+public final class PacketEntityEnderDragonPart extends PacketEntity {
+
+    private final DragonPart part;
+    private final float width, height;
+
+    public PacketEntityEnderDragonPart(GrimPlayer player, DragonPart part, double x, double y, double z, float width, float height) {
+        super(player, EntityTypes.ENDER_DRAGON, x, y, z);
+        this.part = part;
+        this.width = width;
+        this.height = height;
+    }
+
+    public float getWidth() {
+        return width;
+    }
+
+    public float getHeight() {
+        return height;
+    }
+
+    public DragonPart getPart() {
+        return part;
+    }
+}
diff --git a/src/main/java/ac/grim/grimac/utils/latency/CompensatedEntities.java b/src/main/java/ac/grim/grimac/utils/latency/CompensatedEntities.java
@@ -4,6 +4,7 @@
 import ac.grim.grimac.utils.data.ShulkerData;
 import ac.grim.grimac.utils.data.TrackerData;
 import ac.grim.grimac.utils.data.packetentity.*;
+import ac.grim.grimac.utils.data.packetentity.dragon.PacketEntityEnderDragon;
 import ac.grim.grimac.utils.math.GrimMath;
 import ac.grim.grimac.utils.nmsutil.BoundingBoxSize;
 import ac.grim.grimac.utils.nmsutil.WatchableIndexUtil;
@@ -63,6 +64,13 @@ public void removeEntity(int entityID) {
         PacketEntity entity = entityMap.remove(entityID);
         if (entity == null) return;
 
+        if (entity instanceof PacketEntityEnderDragon) {
+            PacketEntityEnderDragon dragon = (PacketEntityEnderDragon) entity;
+            for (int i = 1; i < dragon.getParts().size() + 1; i++) {
+                entityMap.remove(entityID + i);
+            }
+        }
+
         for (PacketEntity passenger : new ArrayList<>(entity.passengers)) {
             passenger.eject();
         }
@@ -237,6 +245,8 @@ public void addEntity(int entityID, EntityType entityType, Vector3d position, fl
                 packetEntity = new PacketEntityTrackXRot(player, entityType, position.getX(), position.getY(), position.getZ(), xRot);
             } else if (EntityTypes.FISHING_BOBBER.equals(entityType)) {
                 packetEntity = new PacketEntityHook(player, entityType, position.getX(), position.getY(), position.getZ(), data);
+            } else if (EntityTypes.ENDER_DRAGON.equals(entityType)) {
+                packetEntity = new PacketEntityEnderDragon(player, entityID, position.getX(), position.getY(), position.getZ());
             } else {
                 packetEntity = new PacketEntity(player, entityType, position.getX(), position.getY(), position.getZ());
             }
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 name: GrimAC
-version: 2.3.64
+version: 2.3.65
 main: ac.grim.grimac.GrimAC
 folia-supported: true
 description: "Libre simulation anticheat designed for 1.20 with 1.8-1.20 support, powered by PacketEvents 2.0."

-Original file line number
+Diff line change
@@ @@ -0,0 +1,9 @@ @@
 +package ac.grim.grimac.utils.data.packetentity.dragon;
++
 +public enum DragonPart {
 +    HEAD,
 +    NECK,
 +    BODY,
 +    TAIL,
 +    WING
 +}