testserver/patches/server/0383-Don-t-run-entity-colli...

31 lines
1.6 KiB
Diff
Raw Normal View History

2021-06-11 12:02:28 +00:00
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 24a16dbfc0852a566dd527639974fcba44bd43fe..8de0a71566d2b095e74c8f8cf15dfac26a5a31c2 100644
2021-06-11 12:02:28 +00:00
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -3340,10 +3340,16 @@ public abstract class LivingEntity extends Entity {
2021-06-11 12:02:28 +00:00
protected void serverAiStep() {}
protected void pushEntities() {
+ // Paper start - don't run getEntities if we're not going to use its result
2021-06-11 12:02:28 +00:00
+ int i = this.level.getGameRules().getInt(GameRules.RULE_MAX_ENTITY_CRAMMING);
+ if (i <= 0 && level.paperConfig().collisions.maxEntityCollisions <= 0) {
2021-06-11 12:02:28 +00:00
+ return;
+ }
+ // Paper end - don't run getEntities if we're not going to use its result
2021-11-24 11:06:34 +00:00
List<Entity> list = this.level.getEntities((Entity) this, this.getBoundingBox(), EntitySelector.pushableBy(this));
2021-06-11 12:02:28 +00:00
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) {