From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Paul Sauve <paul@technove.co> Date: Sun, 9 May 2021 16:49:49 -0500 Subject: [PATCH] Use array for gamerule storage diff --git a/src/main/java/net/minecraft/world/level/GameRules.java b/src/main/java/net/minecraft/world/level/GameRules.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/net/minecraft/world/level/GameRules.java +++ b/src/main/java/net/minecraft/world/level/GameRules.java @@ -0,0 +0,0 @@ public class GameRules { public static final GameRules.Key<GameRules.BooleanValue> RULE_DO_VINES_SPREAD = GameRules.register("doVinesSpread", GameRules.Category.UPDATES, GameRules.BooleanValue.create(true)); public static final GameRules.Key<GameRules.BooleanValue> RULE_ENDER_PEARLS_VANISH_ON_DEATH = GameRules.register("enderPearlsVanishOnDeath", GameRules.Category.PLAYER, GameRules.BooleanValue.create(true)); private final Map<GameRules.Key<?>, GameRules.Value<?>> rules; + private final GameRules.Value<?>[] gameruleArray; // Paper private static <T extends GameRules.Value<T>> GameRules.Key<T> register(String name, GameRules.Category category, GameRules.Type<T> type) { GameRules.Key<T> gamerules_gamerulekey = new GameRules.Key<>(name, category); @@ -0,0 +0,0 @@ public class GameRules { } public GameRules() { - this.rules = (Map) GameRules.GAME_RULE_TYPES.entrySet().stream().collect(ImmutableMap.toImmutableMap(Entry::getKey, (entry) -> { + // Paper start - use this to ensure gameruleArray is initialized + this((Map) GameRules.GAME_RULE_TYPES.entrySet().stream().collect(ImmutableMap.toImmutableMap(Entry::getKey, (entry) -> { return ((GameRules.Type) entry.getValue()).createRule(); - })); + }))); + // Paper end } private GameRules(Map<GameRules.Key<?>, GameRules.Value<?>> rules) { this.rules = rules; + + // Paper start + int arraySize = rules.keySet().stream().mapToInt(key -> key.gameRuleIndex).max().orElse(-1) + 1; + GameRules.Value<?>[] values = new GameRules.Value[arraySize]; + + for (Entry<GameRules.Key<?>, GameRules.Value<?>> entry : rules.entrySet()) { + values[entry.getKey().gameRuleIndex] = entry.getValue(); + } + + this.gameruleArray = values; + // Paper end } public <T extends GameRules.Value<T>> T getRule(GameRules.Key<T> key) { - return (T) this.rules.get(key); // CraftBukkit - decompile error + return key == null ? null : (T) this.gameruleArray[key.gameRuleIndex]; // Paper } public CompoundTag createTag() { @@ -0,0 +0,0 @@ public class GameRules { } public static final class Key<T extends GameRules.Value<T>> { + // Paper start + private static int lastGameRuleIndex = 0; + public final int gameRuleIndex = lastGameRuleIndex++; + // Paper end final String id; private final GameRules.Category category;