Merge pull request #1720 from ManInMyVan/fix/BadPacketsX-false

fix a BadPacketsX false
GrimAnticheat · Sep 14, 2024 · 0d28fa3 · 0d28fa3
2 parents 87c5c1d + 1fe77a1
commit 0d28fa3
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsX.java b/src/main/java/ac/grim/grimac/checks/impl/badpackets/BadPacketsX.java
@@ -25,17 +25,16 @@ public final void handle(PacketReceiveEvent event, WrapperPlayClientPlayerDiggin
         if (dig.getAction() != DiggingAction.START_DIGGING && dig.getAction() != DiggingAction.FINISHED_DIGGING)
             return;
 
-        final boolean invalid;
-
-        if (dig.getAction() == DiggingAction.FINISHED_DIGGING) {
-            invalid = BlockBreakSpeed.getBlockDamage(player, dig.getBlockPosition()) >= 1 || block.getHardness() == -1.0f;
-        } else invalid = (block == StateTypes.LIGHT && !(player.getInventory().getHeldItem().is(ItemTypes.LIGHT) || player.getInventory().getOffHand().is(ItemTypes.LIGHT)))
+        // the block does not have a hitbox
+        boolean invalid = (block == StateTypes.LIGHT && !(player.getInventory().getHeldItem().is(ItemTypes.LIGHT) || player.getInventory().getOffHand().is(ItemTypes.LIGHT)))
                 || block.isAir()
                 || block == StateTypes.WATER
                 || block == StateTypes.LAVA
                 || block == StateTypes.BUBBLE_COLUMN
                 || block == StateTypes.MOVING_PISTON
-                || (block == StateTypes.FIRE && noFireHitbox);
+                || (block == StateTypes.FIRE && noFireHitbox)
+                // or the client claims to have broken an unbreakable block
+                || block.getHardness() == -1.0f && dig.getAction() == DiggingAction.FINISHED_DIGGING;
 
         if (invalid && flagAndAlert("block=" + block.getName() + ", type=" + dig.getAction()) && shouldModifyPackets()) {
             event.setCancelled(true);