diff --git a/core/src/main/java/org/geysermc/geyser/session/cache/TagCache.java b/core/src/main/java/org/geysermc/geyser/session/cache/TagCache.java index 0f33218e5..e235a72fd 100644 --- a/core/src/main/java/org/geysermc/geyser/session/cache/TagCache.java +++ b/core/src/main/java/org/geysermc/geyser/session/cache/TagCache.java @@ -99,6 +99,7 @@ public final class TagCache { int[][] tags = new int[vanillaTags.size() + nonVanillaTagKeys.size()][]; + // Load all vanilla tags first (whether the server sent them or not), then load all the remaining non-vanilla tags the server might have sent. for (Map.Entry vanillaTag : vanillaTags.entrySet()) { tags[((VanillaTag) vanillaTag.getValue()).ordinal()] = packetTags.getOrDefault(vanillaTag.getKey(), new int[0]); } diff --git a/core/src/main/java/org/geysermc/geyser/session/cache/tags/TagRegistry.java b/core/src/main/java/org/geysermc/geyser/session/cache/tags/TagRegistry.java index d20fd61b0..9e57ea5ab 100644 --- a/core/src/main/java/org/geysermc/geyser/session/cache/tags/TagRegistry.java +++ b/core/src/main/java/org/geysermc/geyser/session/cache/tags/TagRegistry.java @@ -65,10 +65,6 @@ public enum TagRegistry { return Map.copyOf(vanillaTags); } - public static boolean shouldLoad(Key registryKey) { - return fromKey(registryKey) != null; - } - @Nullable public static TagRegistry fromKey(Key registryKey) { for (TagRegistry registry : TagRegistry.values()) {