Merge pull request #1452 from xEcho1337/2.0

Fire Hitbox Fix
GrimAnticheat · May 1, 2024 · f8a3be0 · f8a3be0
2 parents 0865e91 + 44fb64a
commit f8a3be0
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/main/java/ac/grim/grimac/utils/collisions/HitboxData.java b/src/main/java/ac/grim/grimac/utils/collisions/HitboxData.java
@@ -270,9 +270,14 @@ public enum HitboxData {
             NoCollisionBox.INSTANCE,
             StateTypes.REDSTONE_WIRE),
 
-    FIRE((player, item, version, data, x, y, z) ->
-            NoCollisionBox.INSTANCE,
-            BlockTags.FIRE.getStates().toArray(new StateType[0])),
+    FIRE((player, item, version, data, x, y, z) -> {
+        // Since 1.16 fire has a small hitbox
+        if (version.isNewerThanOrEquals(ClientVersion.V_1_16)) {
+            return new HexCollisionBox(0.0D, 0.0D, 0.0D, 16.0D, 1.0D, 16.0D);
+        }
+
+        return NoCollisionBox.INSTANCE;
+    }, BlockTags.FIRE.getStates().toArray(new StateType[0])),
 
     BANNER(((player, item, version, data, x, y, z) ->
             new SimpleCollisionBox(4.0, 0.0, 4.0, 12.0, 16.0, 12.0)),