Merge pull request #1821 from Axionize/fix-complex-fence-boxes

Fix CCB constructor for DynamicHitboxFence
GrimAnticheat · Nov 24, 2024 · 1ef4b4e · 1ef4b4e
2 parents 954eb8b + 9bd5c2d
commit 1ef4b4e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/main/java/ac/grim/grimac/utils/collisions/blocks/connecting/DynamicHitboxFence.java b/src/main/java/ac/grim/grimac/utils/collisions/blocks/connecting/DynamicHitboxFence.java
@@ -16,7 +16,6 @@
 import com.github.retrooper.packetevents.protocol.world.states.type.StateType;
 import com.github.retrooper.packetevents.protocol.world.states.type.StateTypes;
 
-
 public class DynamicHitboxFence extends DynamicConnecting implements HitBoxFactory {
     private static final CollisionBox[] MODERN_HITBOXES = makeShapes(2.0F, 2.0F, 24.0F, 0.0F, 24.0F, true, 1);
 

diff --git a/src/main/java/ac/grim/grimac/utils/collisions/datatypes/ComplexCollisionBox.java b/src/main/java/ac/grim/grimac/utils/collisions/datatypes/ComplexCollisionBox.java
@@ -20,8 +20,8 @@ public ComplexCollisionBox(int maxIndex) {
 
     public ComplexCollisionBox(int maxIndex, SimpleCollisionBox... boxes) {
         this.boxes = new SimpleCollisionBox[maxIndex];
-        System.arraycopy(boxes, 0, this.boxes, 0, Math.min(maxIndex, boxes.length));
-        currentLength = boxes.length;
+        currentLength = Math.min(maxIndex, boxes.length);
+        System.arraycopy(boxes, 0, this.boxes, 0, this.currentLength);
     }
 
     public boolean add(SimpleCollisionBox collisionBox) {