From c99c92d1a7ec76c2ac2def8ecd34900a64af8fa6 Mon Sep 17 00:00:00 2001
From: 2No2Name <50278648+2No2Name@users.noreply.github.com>
Date: Tue, 1 Feb 2022 20:49:41 +0000
Subject: [PATCH] Use vanilla cramming code when possible (#1308)

Improve compatibility with mods that manipulate how cramming works. When the carpet rule is disabled, the vanilla code can be used, allowing features from other mods to work.
---
 .../java/carpet/mixins/LivingEntity_maxCollisionsMixin.java   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/java/carpet/mixins/LivingEntity_maxCollisionsMixin.java b/src/main/java/carpet/mixins/LivingEntity_maxCollisionsMixin.java
index c7f4369e..9c07ebf1 100644
--- a/src/main/java/carpet/mixins/LivingEntity_maxCollisionsMixin.java
+++ b/src/main/java/carpet/mixins/LivingEntity_maxCollisionsMixin.java
@@ -30,6 +30,10 @@ public abstract class LivingEntity_maxCollisionsMixin extends Entity
 
     @Inject(method = "pushEntities", cancellable = true, at = @At("HEAD"))
     private void tickPushingReplacement(CallbackInfo ci) {
+        if (CarpetSettings.maxEntityCollisions == 0)
+        {
+            return;
+        }
         List<Entity> entities;
         int maxEntityCramming =-1;
         if (CarpetSettings.maxEntityCollisions > 0)