From dc5a06aab4e59149549b6da6f2dcffcd5926ecd7 Mon Sep 17 00:00:00 2001 From: LexManos Date: Fri, 4 Oct 2019 10:36:50 -0700 Subject: [PATCH] Fix dimension types being incorrect when connecting to a non-Forge server. Closes #6203 --- .../java/net/minecraftforge/fml/network/NetworkHooks.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/minecraftforge/fml/network/NetworkHooks.java b/src/main/java/net/minecraftforge/fml/network/NetworkHooks.java index a171eb016..4ffecfed2 100644 --- a/src/main/java/net/minecraftforge/fml/network/NetworkHooks.java +++ b/src/main/java/net/minecraftforge/fml/network/NetworkHooks.java @@ -66,7 +66,7 @@ public class NetworkHooks public static IPacket getEntitySpawningPacket(Entity entity) { - return FMLNetworkConstants.playChannel.toVanillaPacket(new FMLPlayMessages.SpawnEntity(entity), NetworkDirection.PLAY_TO_CLIENT); + return FMLNetworkConstants.playChannel.toVanillaPacket(new FMLPlayMessages.SpawnEntity(entity), NetworkDirection.PLAY_TO_CLIENT); } public static boolean onCustomPayload(final ICustomPacket packet, final NetworkManager manager) { @@ -198,7 +198,7 @@ public class NetworkHooks // internal tracking map for custom dimensions received from servers for use on client. private static Int2ObjectMap trackingMap = new Int2ObjectOpenHashMap<>(); public static DimensionType getDummyDimType(final int dimension) { - return trackingMap.getOrDefault(dimension, DimensionType.OVERWORLD); + return trackingMap.computeIfAbsent(dimension, id -> DimensionType.getById(id)); } static void addCachedDimensionType(final DimensionType dimensionType, final ResourceLocation dimName) {