2018-07-27 03:57:31 +00:00
|
|
|
From 7feae31914ee5d50576995af8fbe35a44b1f0de3 Mon Sep 17 00:00:00 2001
|
2018-07-04 07:55:24 +00:00
|
|
|
From: Aikar <aikar@aikar.co>
|
|
|
|
Date: Wed, 4 Jul 2018 02:13:59 -0400
|
|
|
|
Subject: [PATCH] Store counts for each Entity/Block Entity Type
|
|
|
|
|
|
|
|
Opens door for future patches to optimize performance
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
|
2018-07-27 03:57:31 +00:00
|
|
|
index ea167a17bb..efcece7857 100644
|
2018-07-04 07:55:24 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/Chunk.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/Chunk.java
|
|
|
|
@@ -34,15 +34,19 @@ public class Chunk {
|
|
|
|
public final Map<BlockPosition, TileEntity> tileEntities;
|
|
|
|
public final List<Entity>[] entitySlices; // Spigot
|
|
|
|
// Paper start
|
|
|
|
+ public final co.aikar.util.Counter<String> entityCounts = new co.aikar.util.Counter<>();
|
|
|
|
+ public final co.aikar.util.Counter<String> tileEntityCounts = new co.aikar.util.Counter<>();
|
|
|
|
private class TileEntityHashMap extends java.util.HashMap<BlockPosition, TileEntity> {
|
|
|
|
@Override
|
|
|
|
public TileEntity put(BlockPosition key, TileEntity value) {
|
|
|
|
TileEntity replaced = super.put(key, value);
|
|
|
|
if (replaced != null) {
|
|
|
|
replaced.setCurrentChunk(null);
|
2018-07-27 03:57:31 +00:00
|
|
|
+ tileEntityCounts.decrement(replaced.getMinecraftKeyString());
|
2018-07-04 07:55:24 +00:00
|
|
|
}
|
|
|
|
if (value != null) {
|
|
|
|
value.setCurrentChunk(Chunk.this);
|
2018-07-27 03:57:31 +00:00
|
|
|
+ tileEntityCounts.increment(value.getMinecraftKeyString());
|
2018-07-04 07:55:24 +00:00
|
|
|
}
|
|
|
|
return replaced;
|
|
|
|
}
|
|
|
|
@@ -52,6 +56,7 @@ public class Chunk {
|
|
|
|
TileEntity removed = super.remove(key);
|
|
|
|
if (removed != null) {
|
|
|
|
removed.setCurrentChunk(null);
|
2018-07-27 03:57:31 +00:00
|
|
|
+ tileEntityCounts.decrement(removed.getMinecraftKeyString());
|
2018-07-04 07:55:24 +00:00
|
|
|
}
|
|
|
|
return removed;
|
|
|
|
}
|
2018-07-15 06:44:37 +00:00
|
|
|
@@ -635,6 +640,7 @@ public class Chunk {
|
|
|
|
this.entitySlices[k].add(entity);
|
2018-07-04 07:55:24 +00:00
|
|
|
// Paper start
|
|
|
|
entity.setCurrentChunk(this);
|
2018-07-27 03:57:31 +00:00
|
|
|
+ entityCounts.increment(entity.getMinecraftKeyString());
|
2018-07-04 07:55:24 +00:00
|
|
|
// Paper end
|
2018-07-15 06:44:37 +00:00
|
|
|
// Spigot start - increment creature type count
|
|
|
|
// Keep this synced up with World.a(Class)
|
|
|
|
@@ -670,6 +676,7 @@ public class Chunk {
|
|
|
|
this.entitySlices[i].remove(entity);
|
2018-07-04 07:55:24 +00:00
|
|
|
// Paper start
|
|
|
|
entity.setCurrentChunk(null);
|
2018-07-27 03:57:31 +00:00
|
|
|
+ entityCounts.decrement(entity.getMinecraftKeyString());
|
2018-07-04 07:55:24 +00:00
|
|
|
// Paper end
|
2018-07-15 06:44:37 +00:00
|
|
|
// Spigot start - decrement creature type count
|
|
|
|
// Keep this synced up with World.a(Class)
|
2018-07-04 07:55:24 +00:00
|
|
|
--
|
|
|
|
2.18.0
|
|
|
|
|