31 lines
1.6 KiB
Diff
31 lines
1.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
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
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
index 2e931bf17309b3b679b7ad9c98e1107d9a971e1d..73be677946a5e7b1f522b69bef395b0725996e5c 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
@@ -3280,10 +3280,16 @@ public abstract class LivingEntity extends Entity {
|
|
protected void serverAiStep() {}
|
|
|
|
protected void pushEntities() {
|
|
+ // Paper start - don't run getEntities if we're not going to use its result
|
|
+ int i = this.level.getGameRules().getInt(GameRules.RULE_MAX_ENTITY_CRAMMING);
|
|
+ if (i <= 0 && level.paperConfig.maxCollisionsPerEntity <= 0) {
|
|
+ return;
|
|
+ }
|
|
+ // Paper end - don't run getEntities if we're not going to use its result
|
|
List<Entity> list = this.level.getEntities((Entity) this, this.getBoundingBox(), EntitySelector.pushableBy(this));
|
|
|
|
if (!list.isEmpty()) {
|
|
- int i = this.level.getGameRules().getInt(GameRules.RULE_MAX_ENTITY_CRAMMING);
|
|
+ // Paper - move up
|
|
int j;
|
|
|
|
if (i > 0 && list.size() > i - 1 && this.random.nextInt(4) == 0) {
|