From b5e5145a64d772c22a4b0967dfdd31bec35e3f95 Mon Sep 17 00:00:00 2001 From: Ammar Askar Date: Sat, 20 Apr 2013 12:26:20 +0500 Subject: [PATCH] Save entity counts for randomly spawned creatures to avoid repeatedly traversing over the entity slices diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java index 7416edc..958b5af 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -9,6 +9,7 @@ import java.util.Map; import java.util.Random; import org.bukkit.Bukkit; // CraftBukkit +import gnu.trove.map.hash.TObjectIntHashMap; // Spigot public class Chunk { @@ -33,6 +34,7 @@ public class Chunk { public int p; private int u; boolean q; + protected TObjectIntHashMap entityCount = new TObjectIntHashMap(); // Spigot public Chunk(World world, int i, int j) { this.sections = new ChunkSection[16]; @@ -560,6 +562,13 @@ public class Chunk { entity.ak = k; entity.al = this.z; this.entitySlices[k].add(entity); + // Spigot start - increment creature type count + for (EnumCreatureType creatureType : EnumCreatureType.values()) { + if (creatureType.a().isAssignableFrom(entity.getClass())) { + this.entityCount.adjustOrPutValue(creatureType.a(), 1, 1); + } + } + // Spigot end } public void b(Entity entity) { @@ -576,6 +585,13 @@ public class Chunk { } this.entitySlices[i].remove(entity); + // Spigot start - decrement creature type count + for (EnumCreatureType creatureType : EnumCreatureType.values()) { + if (creatureType.a().isAssignableFrom(entity.getClass())) { + this.entityCount.adjustValue(creatureType.a(), -1); + } + } + // Spigot end } public boolean d(int i, int j, int k) { diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java index 3529074..25b83f7 100644 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java @@ -33,14 +33,8 @@ public final class SpawnerCreature { for (Long coord : b.keySet()) { int x = LongHash.msw(coord); int z = LongHash.lsw(coord); - if (!server.chunkProviderServer.unloadQueue.contains(x,z) && server.isChunkLoaded(x, z)) { - for (List entitySlice : server.getChunkAt(x, z).entitySlices) { - for (Entity entity : entitySlice) { - if (oClass.isAssignableFrom(entity.getClass())) { - ++i; - } - } - } + if (!server.chunkProviderServer.unloadQueue.contains(coord) && server.isChunkLoaded(x, z)) { + i += server.getChunkAt(x, z).entityCount.get(oClass); } } return i; -- 1.8.2.1