From 0000000000000000000000000000000000000000 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/world/level/biome/MobSpawnSettings.java b/src/main/java/net/minecraft/world/level/biome/MobSpawnSettings.java index 4e06bb1fbda33e79044ac54758b559f7436882a7..86528ff031014e788d72a8bf7c1c9443512096bb 100644 --- a/src/main/java/net/minecraft/world/level/biome/MobSpawnSettings.java +++ b/src/main/java/net/minecraft/world/level/biome/MobSpawnSettings.java @@ -70,11 +70,43 @@ public class MobSpawnSettings { } public static class Builder { - private final Map> spawners = Stream.of(MobCategory.values()).collect(ImmutableMap.toImmutableMap((mobCategory) -> { + // 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(MobSpawnSettings.SpawnerData BiomeSettingsMobs) { + biomes.add(BiomeSettingsMobs); + return super.add(BiomeSettingsMobs); + } + + @Override + public MobSpawnSettings.SpawnerData remove(int index) { + MobSpawnSettings.SpawnerData removed = super.remove(index); + if (removed != null) { + biomes.remove(removed); + } + return removed; + } + + @Override + public void clear() { + biomes.clear(); + super.clear(); + } + } + // use toImmutableEnumMap collector + private final Map> spawners = (Map) Stream.of(MobCategory.values()).collect(Maps.toImmutableEnumMap((mobCategory) -> { return mobCategory; }, (mobCategory) -> { - return Lists.newArrayList(); + return new MobList(); // Use MobList instead of ArrayList })); + // Paper end private final Map, MobSpawnSettings.MobSpawnCost> mobSpawnCosts = Maps.newLinkedHashMap(); private float creatureGenerationProbability = 0.1F; private boolean playerCanSpawn;