2020-05-06 09:48:49 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2020-04-16 04:40:34 +00:00
|
|
|
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
|
|
|
|
|
Date: Wed, 15 Apr 2020 17:56:07 -0700
|
|
|
|
|
Subject: [PATCH] Don't run entity collision code if not needed
|
|
|
|
|
|
|
|
|
|
Will not run if max entity craming is disabled and
|
|
|
|
|
the max collisions per entity is less than or equal to 0
|
|
|
|
|
|
2021-03-16 07:19:45 +00:00
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/EntityLiving.java b/src/main/java/net/minecraft/world/entity/EntityLiving.java
|
2021-06-11 06:29:15 +00:00
|
|
|
index 571e6bced3cfaacbd40378e67b01cdfda550feb7..40fb7e96af7bbbe6c5586fa4d2a629b5a8f7b07a 100644
|
2021-03-16 07:19:45 +00:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/EntityLiving.java
|
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/EntityLiving.java
|
2021-03-16 13:04:28 +00:00
|
|
|
@@ -2944,10 +2944,16 @@ public abstract class EntityLiving extends Entity {
|
2020-04-16 04:40:34 +00:00
|
|
|
protected void doTick() {}
|
|
|
|
|
|
|
|
|
|
protected void collideNearby() {
|
|
|
|
|
+ // Paper - start don't run getEntities if we're not going to use its result
|
|
|
|
|
+ int i = this.world.getGameRules().getInt(GameRules.MAX_ENTITY_CRAMMING);
|
|
|
|
|
+ if (i <= 0 && world.paperConfig.maxCollisionsPerEntity <= 0) {
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+ // Paper - end don't run getEntities if we're not going to use its result
|
|
|
|
|
List<Entity> list = this.world.getEntities(this, this.getBoundingBox(), IEntitySelector.a(this));
|
|
|
|
|
|
|
|
|
|
if (!list.isEmpty()) {
|
|
|
|
|
- int i = this.world.getGameRules().getInt(GameRules.MAX_ENTITY_CRAMMING);
|
|
|
|
|
+ // Paper - move up
|
|
|
|
|
int j;
|
|
|
|
|
|
|
|
|
|
if (i > 0 && list.size() > i - 1 && this.random.nextInt(4) == 0) {
|
