From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Samsuik <kfian294ma4@gmail.com>
Date: Thu, 23 Sep 2021 18:50:13 +0100
Subject: [PATCH] Use maxEntityCollision limit for entity retrieval


diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
index 53053302b38e7a82c55234f4808f2629814d4e57..e04be1dc74b2fc76b98b9d364b1a212f20d5356a 100644
--- a/net/minecraft/world/entity/LivingEntity.java
+++ b/net/minecraft/world/entity/LivingEntity.java
@@ -3782,7 +3782,17 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
             return;
         }
         // Paper end - don't run getEntities if we're not going to use its result
-        List<Entity> pushableEntities = this.level().getPushableEntities(this, this.getBoundingBox());
+        // Sakura start - use maxEntityCollision limit for entity retrieval
+        //List<Entity> pushableEntities = this.level().getPushableEntities(this, this.getBoundingBox());
+        final int limit = Math.max(_int, this.level().paperConfig().collisions.maxEntityCollisions);
+        final int search = limit * limit;
+        final List<Entity> pushableEntities = new java.util.ArrayList<>(4);
+        this.level().getEntities(
+            net.minecraft.world.level.entity.EntityTypeTest.forClass(Entity.class),
+            this.getBoundingBox(), EntitySelector.pushableBy(this),
+            pushableEntities, limit, search
+        );
+        // Sakura end - use maxEntityCollision limit for entity retrieval
         if (!pushableEntities.isEmpty()) {
             if (this.level() instanceof ServerLevel serverLevel) {
                 // Paper - don't run getEntities if we're not going to use its result; moved up