From 1b58ca21611728bb0502fdc999e0e745e80541a0 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Thu, 16 Apr 2020 00:40:34 -0400 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 --- ...-entity-collision-code-if-not-needed.patch | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 Spigot-Server-Patches/Don-t-run-entity-collision-code-if-not-needed.patch diff --git a/Spigot-Server-Patches/Don-t-run-entity-collision-code-if-not-needed.patch b/Spigot-Server-Patches/Don-t-run-entity-collision-code-if-not-needed.patch new file mode 100644 index 0000000000..b7763e5e15 --- /dev/null +++ b/Spigot-Server-Patches/Don-t-run-entity-collision-code-if-not-needed.patch @@ -0,0 +1,31 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Spottedleaf +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/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java +index ad474500e..dfb9421a1 100644 +--- a/src/main/java/net/minecraft/server/EntityLiving.java ++++ b/src/main/java/net/minecraft/server/EntityLiving.java +@@ -0,0 +0,0 @@ public abstract class EntityLiving extends Entity { + 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 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) { +-- \ No newline at end of file