From 3e64fc7d6db1a903430d4313f4da4d84173428c4 Mon Sep 17 00:00:00 2001 From: Aikar 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 index 85f33c140e..bcafd86fb8 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -63,15 +63,19 @@ public class Chunk implements IChunkAccess { private int neighbors = 0x1 << 12; public long chunkKey; // Paper start + public final co.aikar.util.Counter entityCounts = new co.aikar.util.Counter<>(); + public final co.aikar.util.Counter tileEntityCounts = new co.aikar.util.Counter<>(); private class TileEntityHashMap extends java.util.HashMap { @Override public TileEntity put(BlockPosition key, TileEntity value) { TileEntity replaced = super.put(key, value); if (replaced != null) { replaced.setCurrentChunk(null); + tileEntityCounts.decrement(replaced.getMinecraftKeyString()); } if (value != null) { value.setCurrentChunk(Chunk.this); + tileEntityCounts.increment(value.getMinecraftKeyString()); } return replaced; } @@ -81,6 +85,7 @@ public class Chunk implements IChunkAccess { TileEntity removed = super.remove(key); if (removed != null) { removed.setCurrentChunk(null); + tileEntityCounts.decrement(removed.getMinecraftKeyString()); } return removed; } @@ -670,6 +675,7 @@ public class Chunk implements IChunkAccess { this.entitySlices[k].add(entity); // Paper start entity.setCurrentChunk(this); + entityCounts.increment(entity.getMinecraftKeyString()); // Paper end } @@ -694,6 +700,7 @@ public class Chunk implements IChunkAccess { return; } entity.setCurrentChunk(null); + entityCounts.decrement(entity.getMinecraftKeyString()); // Paper end } -- 2.18.0