Cache dimensions without namespace in 1.19->1.18.2 (#744)

ViaVersion · May 10, 2024 · abb1803 · abb1803
1 parent e45a95c
commit abb1803
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.../com/viaversion/viabackwards/protocol/protocol1_18_2to1_19/packets/EntityPackets1_19.java b/.../com/viaversion/viabackwards/protocol/protocol1_18_2to1_19/packets/EntityPackets1_19.java
@@ -133,11 +133,11 @@ public void register() {
                     final ListTag<CompoundTag> dimensions = TagUtil.getRegistryEntries(registry, "dimension_type");
                     boolean found = false;
                     for (final CompoundTag dimension : dimensions) {
-                        final StringTag nameTag = dimension.getStringTag("name");
+                        final String name = Key.stripMinecraftNamespace(dimension.getString("name"));
                         final CompoundTag dimensionData = dimension.getCompoundTag("element");
-                        dimensionRegistryStorage.addDimension(nameTag.getValue(), dimensionData.copy());
+                        dimensionRegistryStorage.addDimension(name, dimensionData.copy());
 
-                        if (!found && Key.stripMinecraftNamespace(nameTag.getValue()).equals(dimensionKey)) {
+                        if (!found && name.equals(dimensionKey)) {
                             wrapper.write(Type.NAMED_COMPOUND_TAG, dimensionData);
                             found = true;
                         }

diff --git a/...aversion/viabackwards/protocol/protocol1_18_2to1_19/storage/DimensionRegistryStorage.java b/...aversion/viabackwards/protocol/protocol1_18_2to1_19/storage/DimensionRegistryStorage.java
@@ -24,6 +24,7 @@
 import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag;
 import java.util.HashMap;
 import java.util.Map;
+import com.viaversion.viaversion.util.Key;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 public final class DimensionRegistryStorage implements StorableObject {
@@ -32,7 +33,7 @@ public final class DimensionRegistryStorage implements StorableObject {
     private final Int2ObjectMap<CompoundTag> chatTypes = new Int2ObjectOpenHashMap<>();
 
     public @Nullable CompoundTag dimension(final String dimensionKey) {
-        final CompoundTag compoundTag = dimensions.get(dimensionKey);
+        final CompoundTag compoundTag = dimensions.get(Key.stripMinecraftNamespace(dimensionKey));
         return compoundTag != null ? compoundTag.copy() : null;
     }