From 69d50fa99207fd207e2e7d45303f70bbe16f8f79 Mon Sep 17 00:00:00 2001 From: Nassim Jahnke Date: Mon, 23 May 2022 19:38:38 +0200 Subject: [PATCH] Join game fixes --- .../protocols/protocol1_19to1_18_2/packets/EntityPackets.java | 3 ++- .../protocol1_19to1_18_2/storage/DimensionRegistryStorage.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19to1_18_2/packets/EntityPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19to1_18_2/packets/EntityPackets.java index a8dedb2f8..fbb079571 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19to1_18_2/packets/EntityPackets.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19to1_18_2/packets/EntityPackets.java @@ -253,7 +253,7 @@ public final class EntityPackets extends EntityRewriter { final String name = (String) dimensionCompound.get("name").getValue(); dimensionDataMap.put(name, new DimensionDataImpl(element)); - dimensionsMap.put(element, name); + dimensionsMap.put(element.clone(), name); } tracker(wrapper.user()).setDimensions(dimensionDataMap); @@ -268,6 +268,7 @@ public final class EntityPackets extends EntityRewriter { map(Type.VAR_INT); // Simulation distance map(Type.BOOLEAN); // Reduced debug info map(Type.BOOLEAN); // Show death screen + map(Type.BOOLEAN); // Debug map(Type.BOOLEAN); // Flat create(Type.OPTIONAL_GLOBAL_POSITION, null); // Last death location handler(playerTrackerHandler()); diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19to1_18_2/storage/DimensionRegistryStorage.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19to1_18_2/storage/DimensionRegistryStorage.java index 85fc2b4c8..1cc41b3eb 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19to1_18_2/storage/DimensionRegistryStorage.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19to1_18_2/storage/DimensionRegistryStorage.java @@ -27,7 +27,7 @@ public final class DimensionRegistryStorage implements StorableObject { private Map dimensions; - public @Nullable String dimensionKey(CompoundTag dimensionData) { + public @Nullable String dimensionKey(final CompoundTag dimensionData) { return dimensions.get(dimensionData); // HMMMMMMMMMMM }