e07e0cb3ca
There is no reason for the light queue to even be an option. This enables the light queue for everyone. This also improves the "can we still tick" time logic to always check before running a light operation. previously, we always executed at least 10 on the first world (but not other worlds...), but we are seeing light take up some heavy time, so improving that for now. I've now also improved recheck gaps logic to happen at the end of all single block updates This also prevents multiple gap checks, as previously if a tick skipped the gaps check, the next tick would end up re-adding the entry again, resulting in multiple gap checks. This now just sets a marker "We need to recheck gaps" and will only occur once. This also should reduce chunk loads, as previously, we checked if the neighbor chunks were loaded for the gap check, however those neighbor chunks might of unloaded before the light queue operation actually ran. Now, the neighbor chunk is done when the gap check is being done, so it should avoid loading chunks. Fixes #1466 Fixes #1431
93 Zeilen
4.0 KiB
Diff
93 Zeilen
4.0 KiB
Diff
From e61e80dd98e4bd16ff5d3277d7d7666b248eedca 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 703c377f93..a04a296172 100644
|
|
--- a/src/main/java/net/minecraft/server/Chunk.java
|
|
+++ b/src/main/java/net/minecraft/server/Chunk.java
|
|
@@ -91,6 +91,10 @@ public class Chunk implements IChunkAccess {
|
|
}
|
|
}
|
|
final PaperLightingQueue.LightingQueue lightingQueue = new PaperLightingQueue.LightingQueue(this);
|
|
+ // 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
|
|
public boolean areNeighborsLoaded(final int radius) {
|
|
switch (radius) {
|
|
@@ -685,6 +689,11 @@ public class Chunk implements IChunkAccess {
|
|
entity.ag = this.locZ;
|
|
this.entitySlices[k].add(entity);
|
|
// Paper start
|
|
+ if (entity instanceof EntityItem) {
|
|
+ itemCounts[k]++;
|
|
+ } else if (entity instanceof IInventory) {
|
|
+ inventoryEntityCounts[k]++;
|
|
+ }
|
|
entity.setCurrentChunk(this);
|
|
entityCounts.increment(entity.getMinecraftKeyString());
|
|
// Paper end
|
|
@@ -710,6 +719,11 @@ public class Chunk implements IChunkAccess {
|
|
if (!this.entitySlices[i].remove(entity)) {
|
|
return;
|
|
}
|
|
+ if (entity instanceof EntityItem) {
|
|
+ itemCounts[i]--;
|
|
+ } else if (entity instanceof IInventory) {
|
|
+ inventoryEntityCounts[i]--;
|
|
+ }
|
|
entity.setCurrentChunk(null);
|
|
entityCounts.decrement(entity.getMinecraftKeyString());
|
|
// Paper end
|
|
@@ -912,6 +926,15 @@ public class Chunk implements IChunkAccess {
|
|
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();
|
|
|
|
@@ -948,7 +971,18 @@ public class Chunk implements IChunkAccess {
|
|
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.19.0
|
|
|