From 32ea23591f767b01ce3893ad959e9fa75064750f Mon Sep 17 00:00:00 2001 From: BoomEaro <21033866+BoomEaro@users.noreply.github.com> Date: Thu, 9 Jun 2022 19:12:53 +0300 Subject: [PATCH] Fix dimension for 1.19 --- src/main/java/ru/nanit/limbo/configuration/LimboConfig.java | 6 ++++++ .../java/ru/nanit/limbo/connection/PacketSnapshots.java | 5 +++-- .../ru/nanit/limbo/world/dimension/DimensionRegistry.java | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/main/java/ru/nanit/limbo/configuration/LimboConfig.java b/src/main/java/ru/nanit/limbo/configuration/LimboConfig.java index ae0ecbf..ac27ff1 100644 --- a/src/main/java/ru/nanit/limbo/configuration/LimboConfig.java +++ b/src/main/java/ru/nanit/limbo/configuration/LimboConfig.java @@ -87,6 +87,12 @@ public final class LimboConfig { maxPlayers = conf.node("maxPlayers").getInt(); pingData = conf.node("ping").get(PingData.class); dimensionType = conf.node("dimension").getString(); + if (dimensionType.equalsIgnoreCase("nether")) { + dimensionType = "the_nether"; + } + if (dimensionType.equalsIgnoreCase("end")) { + dimensionType = "the_end"; + } spawnPosition = conf.node("spawnPosition").get(Location.class); gameMode = conf.node("gameMode").getInt(); useBrandName = conf.node("brandName", "enable").getBoolean(); diff --git a/src/main/java/ru/nanit/limbo/connection/PacketSnapshots.java b/src/main/java/ru/nanit/limbo/connection/PacketSnapshots.java index 1715f60..0ab5567 100644 --- a/src/main/java/ru/nanit/limbo/connection/PacketSnapshots.java +++ b/src/main/java/ru/nanit/limbo/connection/PacketSnapshots.java @@ -74,8 +74,9 @@ public final class PacketSnapshots { joinGame.setReducedDebugInfo(true); joinGame.setDebug(false); joinGame.setViewDistance(0); - joinGame.setWorldName("minecraft:overworld"); - joinGame.setWorldNames("minecraft:overworld"); + String worldName = "minecraft:" + server.getConfig().getDimensionType().toLowerCase(); + joinGame.setWorldName(worldName); + joinGame.setWorldNames(worldName); joinGame.setHashedSeed(0); joinGame.setDimensionRegistry(server.getDimensionRegistry()); diff --git a/src/main/java/ru/nanit/limbo/world/dimension/DimensionRegistry.java b/src/main/java/ru/nanit/limbo/world/dimension/DimensionRegistry.java index b043d7b..c5ae4cf 100644 --- a/src/main/java/ru/nanit/limbo/world/dimension/DimensionRegistry.java +++ b/src/main/java/ru/nanit/limbo/world/dimension/DimensionRegistry.java @@ -88,7 +88,7 @@ public final class DimensionRegistry { switch (def.toLowerCase()) { case "overworld": return new Dimension(0, "minecraft:overworld", overWorld); - case "nether": + case "the_nether": return new Dimension(-1, "minecraft:nether", nether); case "the_end": return new Dimension(1, "minecraft:the_end", theEnd);