mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-28 19:22:50 +01:00
e7a59cde75
ideally this should of never mattered, as it will only be hit if you teleport out of an unloaded chunk... But apparently some people are triggering this. See #1223
95 lines
4.1 KiB
Diff
95 lines
4.1 KiB
Diff
From df5be5320addd4ba09e5a65dee413e3eaa6f8dfb Mon Sep 17 00:00:00 2001
|
|
From: CullanP <cullanpage@gmail.com>
|
|
Date: Thu, 3 Mar 2016 02:13:38 -0600
|
|
Subject: [PATCH] Avoid hopper searches if there are no items
|
|
|
|
Hoppers searching for items and minecarts is the most expensive part of hopper ticking.
|
|
We keep track of the number of minecarts and items in a chunk.
|
|
If there are no items in the chunk, we skip searching for items.
|
|
If there are no minecarts in the chunk, we skip searching for them.
|
|
|
|
Usually hoppers aren't near items, so we can skip most item searches.
|
|
And since minecart hoppers are used _very_ rarely near we can avoid alot of searching there.
|
|
|
|
Combined, this adds up a lot.
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
|
|
index f98fe73efa..996a5e71c4 100644
|
|
--- a/src/main/java/net/minecraft/server/Chunk.java
|
|
+++ b/src/main/java/net/minecraft/server/Chunk.java
|
|
@@ -76,6 +76,13 @@ public class Chunk {
|
|
public boolean d;
|
|
protected gnu.trove.map.hash.TObjectIntHashMap<Class> entityCount = new gnu.trove.map.hash.TObjectIntHashMap<Class>(); // Spigot
|
|
|
|
+ // Paper start
|
|
+ // Track the number of minecarts and items
|
|
+ // Keep this synced with entitySlices.add() and entitySlices.remove()
|
|
+ private final int[] itemCounts = new int[16];
|
|
+ private final int[] inventoryEntityCounts = new int[16];
|
|
+ // Paper end
|
|
+
|
|
// CraftBukkit start - Neighbor loaded cache for chunk lighting and entity ticking
|
|
private int neighbors = 0x1 << 12;
|
|
public long chunkKey;
|
|
@@ -651,6 +658,11 @@ public class Chunk {
|
|
// Paper start
|
|
entity.setCurrentChunk(this);
|
|
entityCounts.increment(entity.getMinecraftKeyString());
|
|
+ if (entity instanceof EntityItem) {
|
|
+ itemCounts[k]++;
|
|
+ } else if (entity instanceof IInventory) {
|
|
+ inventoryEntityCounts[k]++;
|
|
+ }
|
|
// Paper end
|
|
// Spigot start - increment creature type count
|
|
// Keep this synced up with World.a(Class)
|
|
@@ -687,6 +699,11 @@ public class Chunk {
|
|
// Paper start
|
|
entity.setCurrentChunk(null);
|
|
entityCounts.decrement(entity.getMinecraftKeyString());
|
|
+ if (entity instanceof EntityItem) {
|
|
+ itemCounts[i]--;
|
|
+ } else if (entity instanceof IInventory) {
|
|
+ inventoryEntityCounts[i]--;
|
|
+ }
|
|
// Paper end
|
|
// Spigot start - decrement creature type count
|
|
// Keep this synced up with World.a(Class)
|
|
@@ -880,6 +897,15 @@ public class Chunk {
|
|
if (!this.entitySlices[k].isEmpty()) {
|
|
Iterator iterator = this.entitySlices[k].iterator();
|
|
|
|
+ // Paper start - Don't search for inventories if we have none, and that is all we want
|
|
+ /*
|
|
+ * We check if they want inventories by seeing if it is the static `IEntitySelector.c`
|
|
+ *
|
|
+ * Make sure the inventory selector stays in sync.
|
|
+ * It should be the one that checks `var1 instanceof IInventory && var1.isAlive()`
|
|
+ */
|
|
+ if (predicate == IEntitySelector.c && inventoryEntityCounts[k] <= 0) continue;
|
|
+ // Paper end
|
|
while (iterator.hasNext()) {
|
|
Entity entity1 = (Entity) iterator.next();
|
|
|
|
@@ -916,7 +942,18 @@ public class Chunk {
|
|
i = MathHelper.clamp(i, 0, this.entitySlices.length - 1);
|
|
j = MathHelper.clamp(j, 0, this.entitySlices.length - 1);
|
|
|
|
+ // Paper start
|
|
+ int[] counts;
|
|
+ if (EntityItem.class.isAssignableFrom(oclass)) {
|
|
+ counts = itemCounts;
|
|
+ } else if (IInventory.class.isAssignableFrom(oclass)) {
|
|
+ counts = inventoryEntityCounts;
|
|
+ } else {
|
|
+ counts = null;
|
|
+ }
|
|
+ // Paper end
|
|
for (int k = i; k <= j; ++k) {
|
|
+ if (counts != null && counts[k] <= 0) continue; // Paper - Don't check a chunk if it doesn't have the type we are looking for
|
|
Iterator iterator = this.entitySlices[k].iterator(); // Spigot
|
|
|
|
while (iterator.hasNext()) {
|
|
--
|
|
2.18.0
|
|
|