2022-12-07 21:16:54 +01: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 cramming is disabled and the max collisions per entity is less than or equal to 0.
|
|
|
|
Entity#isPushable() returns false, meaning all entities will not be able to collide with this
|
|
|
|
entity anyways.
|
|
|
|
The entity's current team collision rule causes them to NEVER collide.
|
|
|
|
|
|
|
|
Co-authored-by: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#10277)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
Bukkit Changes:
9a80d38c SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-722: Add EntityRemoveEvent
258086d9 SPIGOT-7417, PR-967: Add Sign#getTargetSide and Sign#getAllowedEditor
ffaba051 SPIGOT-7584: Add missing Tag.ITEMS_NON_FLAMMABLE_WOOD
CraftBukkit Changes:
98b6c1ac7 SPIGOT-7589 Fix NullPointerException when bans expire
a2736ddb0 SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-1008: Add EntityRemoveEvent
5bf12cb89 SPIGOT-7565: Throw a more descriptive error message when a developer tries to spawn an entity from a CraftBukkit class
76d95fe7e SPIGOT-7417, PR-1343: Add Sign#getTargetSide and Sign#getAllowedEditor
Spigot Changes:
e9ec5485 Rebuild patches
f1b62e0c Rebuild patches
2024-02-23 14:37:33 +01:00
|
|
|
index f441d7a1188cecd91206d78b58457c330e4e8663..178d8e9795a6c451e0ff350d9412bc2e0ee686ae 100644
|
2022-12-07 21:16:54 +01:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#10277)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
Bukkit Changes:
9a80d38c SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-722: Add EntityRemoveEvent
258086d9 SPIGOT-7417, PR-967: Add Sign#getTargetSide and Sign#getAllowedEditor
ffaba051 SPIGOT-7584: Add missing Tag.ITEMS_NON_FLAMMABLE_WOOD
CraftBukkit Changes:
98b6c1ac7 SPIGOT-7589 Fix NullPointerException when bans expire
a2736ddb0 SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-1008: Add EntityRemoveEvent
5bf12cb89 SPIGOT-7565: Throw a more descriptive error message when a developer tries to spawn an entity from a CraftBukkit class
76d95fe7e SPIGOT-7417, PR-1343: Add Sign#getTargetSide and Sign#getAllowedEditor
Spigot Changes:
e9ec5485 Rebuild patches
f1b62e0c Rebuild patches
2024-02-23 14:37:33 +01:00
|
|
|
@@ -3419,10 +3419,24 @@ public abstract class LivingEntity extends Entity implements Attackable {
|
2023-06-08 00:41:25 +02:00
|
|
|
if (this.level().isClientSide()) {
|
|
|
|
this.level().getEntities(EntityTypeTest.forClass(net.minecraft.world.entity.player.Player.class), this.getBoundingBox(), EntitySelector.pushableBy(this)).forEach(this::doPush);
|
2022-12-07 21:16:54 +01:00
|
|
|
} else {
|
|
|
|
+ // Paper start - don't run getEntities if we're not going to use its result
|
|
|
|
+ if (!this.isPushable()) {
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+ net.minecraft.world.scores.Team team = this.getTeam();
|
|
|
|
+ if (team != null && team.getCollisionRule() == net.minecraft.world.scores.Team.CollisionRule.NEVER) {
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+
|
2023-06-08 00:41:25 +02:00
|
|
|
+ int i = this.level().getGameRules().getInt(GameRules.RULE_MAX_ENTITY_CRAMMING);
|
|
|
|
+ if (i <= 0 && this.level().paperConfig().collisions.maxEntityCollisions <= 0) {
|
2022-12-07 21:16:54 +01:00
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+ // Paper end - don't run getEntities if we're not going to use its result
|
2023-06-08 00:41:25 +02:00
|
|
|
List<Entity> list = this.level().getEntities((Entity) this, this.getBoundingBox(), EntitySelector.pushableBy(this));
|
2022-12-07 21:16:54 +01:00
|
|
|
|
|
|
|
if (!list.isEmpty()) {
|
2023-06-08 00:41:25 +02:00
|
|
|
- int i = this.level().getGameRules().getInt(GameRules.RULE_MAX_ENTITY_CRAMMING);
|
2024-01-21 12:11:43 +01:00
|
|
|
+ // Paper - don't run getEntities if we're not going to use its result; moved up
|
2022-12-07 21:16:54 +01:00
|
|
|
|
|
|
|
if (i > 0 && list.size() > i - 1 && this.random.nextInt(4) == 0) {
|
2023-09-22 05:29:51 +02:00
|
|
|
int j = 0;
|