From 91a26f5f31fbdf3cf220efe39c89eb72e51ecbf2 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 12 Sep 2018 21:47:01 -0400 Subject: [PATCH] Optimize Biome Mob Lookups for Mob Spawning Uses an EnumMap as well as a Set paired List for O(1) contains calls. diff --git a/src/main/java/net/minecraft/server/BiomeBase.java b/src/main/java/net/minecraft/server/BiomeBase.java index 253890e53..0102a170d 100644 --- a/src/main/java/net/minecraft/server/BiomeBase.java +++ b/src/main/java/net/minecraft/server/BiomeBase.java @@ -40,7 +40,7 @@ public abstract class BiomeBase { protected final Map>> r = Maps.newHashMap(); protected final List> s = Lists.newArrayList(); protected final Map, WorldGenFeatureConfiguration> t = Maps.newHashMap(); - private final Map> v = Maps.newHashMap(); + private final java.util.EnumMap> v = Maps.newEnumMap(EnumCreatureType.class); // Paper private final ThreadLocal w = ThreadLocal.withInitial(() -> { return (Long2FloatLinkedOpenHashMap) SystemUtils.a(() -> { Long2FloatLinkedOpenHashMap long2floatlinkedopenhashmap = new Long2FloatLinkedOpenHashMap(1024, 0.25F) { @@ -92,7 +92,7 @@ public abstract class BiomeBase { for (j = 0; j < i; ++j) { EnumCreatureType enumcreaturetype = aenumcreaturetype[j]; - this.v.put(enumcreaturetype, Lists.newArrayList()); + this.v.put(enumcreaturetype, new MobList()); // Paper } } else { @@ -327,6 +327,38 @@ public abstract class BiomeBase { return this.m; } + // Paper start - keep track of data in a pair set to give O(1) contains calls - we have to hook removals incase plugins mess with it + public static class MobList extends java.util.ArrayList { + java.util.Set biomes = new java.util.HashSet<>(); + + @Override + public boolean contains(Object o) { + return biomes.contains(o); + } + + @Override + public boolean add(BiomeMeta biomeMeta) { + biomes.add(biomeMeta); + return super.add(biomeMeta); + } + + @Override + public BiomeMeta remove(int index) { + BiomeMeta removed = super.remove(index); + if (removed != null) { + biomes.remove(removed); + } + return removed; + } + + @Override + public void clear() { + biomes.clear(); + super.clear(); + } + } + // Paper end + public static class a { @Nullable -- 2.17.1