mirror of
https://github.com/PaperMC/Paper.git
synced 2024-06-26 23:04:50 +02:00
36f34f01c0
Upstream has released updates that appears 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: da9ef3c5 #496: Add methods to get/set ItemStacks in EquipmentSlots 3abebc9f #492: Let Tameable extend Animals rather than Entity 941111a0 #495: Expose ItemStack and hand used in PlayerShearEntityEvent 4fe19cae #494: InventoryView - Add missing Brewing FUEL_TIME CraftBukkit Changes:933e9094#664: Add methods to get/set ItemStacks in EquipmentSlots18722312#662: Expose ItemStack and hand used in PlayerShearEntityEvent
31 lines
1.5 KiB
Diff
31 lines
1.5 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/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
|
|
index 253e35826f6f51145c278b083d195599affca2a7..2c81344a65bf230a6ba09deb2a3bb45881144a39 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
|
@@ -2666,10 +2666,16 @@ 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<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) {
|