From e1cbdd0abf05f0ad0bb2cc6a192b1d6df6082565 Mon Sep 17 00:00:00 2001 From: SleepyPop <81194303+SleepyPopp@users.noreply.github.com> Date: Thu, 7 May 2026 10:50:04 -0400 Subject: [PATCH 1/6] Comment out this part of GeyserSession.java --- .../java/org/geysermc/geyser/session/GeyserSession.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java b/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java index f16abca6038..3954c6967d5 100644 --- a/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java +++ b/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java @@ -881,7 +881,7 @@ public void connect() { minY = Math.max(minY, -512); maxY = Math.min(maxY, 512); - if (minY < BedrockDimension.OVERWORLD.minY() || maxY > BedrockDimension.OVERWORLD.maxY()) { + /*if (minY < BedrockDimension.OVERWORLD.minY() || maxY > BedrockDimension.OVERWORLD.maxY()) { final boolean isInOverworld = this.bedrockDimension == this.bedrockOverworldDimension; this.bedrockOverworldDimension = new BedrockDimension(minY, maxY - minY, true, BedrockDimension.OVERWORLD_ID); if (isInOverworld) { @@ -890,9 +890,9 @@ public void connect() { geyser.getLogger().debug("Extending overworld dimension to " + minY + " - " + maxY); DimensionDataPacket dimensionDataPacket = new DimensionDataPacket(); - dimensionDataPacket.getDefinitions().add(new DimensionDefinition("minecraft:overworld", maxY, minY, 5 /* Void */)); + dimensionDataPacket.getDefinitions().add(new DimensionDefinition("minecraft:overworld", maxY, minY, 5 *//* Void *//*)); upstream.sendPacket(dimensionDataPacket); - } + }*/ startGame(); sentSpawnPacket = true; From 9ea750fd0f1d7170ed6381c5889ac4e8e132b31b Mon Sep 17 00:00:00 2001 From: SleepyPop <81194303+SleepyPopp@users.noreply.github.com> Date: Thu, 7 May 2026 10:51:13 -0400 Subject: [PATCH 2/6] Missed a part --- .../main/java/org/geysermc/geyser/session/GeyserSession.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java b/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java index 3954c6967d5..3e08e012544 100644 --- a/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java +++ b/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java @@ -878,10 +878,10 @@ public void connect() { maxY = Math.max(maxY, javaDimension.minY() + javaDimension.height()); } } - minY = Math.max(minY, -512); + /*minY = Math.max(minY, -512); maxY = Math.min(maxY, 512); - /*if (minY < BedrockDimension.OVERWORLD.minY() || maxY > BedrockDimension.OVERWORLD.maxY()) { + if (minY < BedrockDimension.OVERWORLD.minY() || maxY > BedrockDimension.OVERWORLD.maxY()) { final boolean isInOverworld = this.bedrockDimension == this.bedrockOverworldDimension; this.bedrockOverworldDimension = new BedrockDimension(minY, maxY - minY, true, BedrockDimension.OVERWORLD_ID); if (isInOverworld) { From 4d66ee43517c506fb507fe4ad9edbb4d1fc5c652 Mon Sep 17 00:00:00 2001 From: SleepyPop <81194303+SleepyPopp@users.noreply.github.com> Date: Thu, 7 May 2026 11:08:08 -0400 Subject: [PATCH 3/6] Apply Chris's recommendation --- .../geyser/session/GeyserSession.java | 31 ++++++++++--------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java b/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java index 3e08e012544..00a39e27d31 100644 --- a/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java +++ b/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java @@ -878,21 +878,24 @@ public void connect() { maxY = Math.max(maxY, javaDimension.minY() + javaDimension.height()); } } - /*minY = Math.max(minY, -512); - maxY = Math.min(maxY, 512); - - if (minY < BedrockDimension.OVERWORLD.minY() || maxY > BedrockDimension.OVERWORLD.maxY()) { - final boolean isInOverworld = this.bedrockDimension == this.bedrockOverworldDimension; - this.bedrockOverworldDimension = new BedrockDimension(minY, maxY - minY, true, BedrockDimension.OVERWORLD_ID); - if (isInOverworld) { - this.bedrockDimension = this.bedrockOverworldDimension; - } - geyser.getLogger().debug("Extending overworld dimension to " + minY + " - " + maxY); - DimensionDataPacket dimensionDataPacket = new DimensionDataPacket(); - dimensionDataPacket.getDefinitions().add(new DimensionDefinition("minecraft:overworld", maxY, minY, 5 *//* Void *//*)); - upstream.sendPacket(dimensionDataPacket); - }*/ + if (GameProtocol.is1_26_20orHigher(protocolVersion())) { + minY = Math.max(minY, -512); + maxY = Math.min(maxY, 512); + + if (minY < BedrockDimension.OVERWORLD.minY() || maxY > BedrockDimension.OVERWORLD.maxY()) { + final boolean isInOverworld = this.bedrockDimension == this.bedrockOverworldDimension; + this.bedrockOverworldDimension = new BedrockDimension(minY, maxY - minY, true, BedrockDimension.OVERWORLD_ID); + if (isInOverworld) { + this.bedrockDimension = this.bedrockOverworldDimension; + } + geyser.getLogger().debug("Extending overworld dimension to " + minY + " - " + maxY); + + DimensionDataPacket dimensionDataPacket = new DimensionDataPacket(); + dimensionDataPacket.getDefinitions().add(new DimensionDefinition("minecraft:overworld", maxY, minY, 5 /* Void */)); + upstream.sendPacket(dimensionDataPacket); + } + } startGame(); sentSpawnPacket = true; From e9ed843a7945f6400b5cd74e67676b805909e050 Mon Sep 17 00:00:00 2001 From: SleepyPop <81194303+SleepyPopp@users.noreply.github.com> Date: Thu, 7 May 2026 11:36:49 -0400 Subject: [PATCH 4/6] Bump protocol dependencies --- gradle/libs.versions.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0543d46218d..2c881222f1b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -13,9 +13,9 @@ guava = "29.0-jre" gson = "2.3.1" # Provided by Spigot 1.8.8 TODO bump to 2.8.1 or similar (Spigot 1.16.5 version) after Merge gson-runtime = "2.10.1" websocket = "1.5.1" -protocol-connection = "3.0.0.Beta12-20260505.144358-18" -protocol-common = "3.0.0.Beta12-20260505.144358-18" -protocol-codec = "3.0.0.Beta12-20260505.144358-18" +protocol-connection = "3.0.0.Beta12-20260507.151512-19" +protocol-common = "3.0.0.Beta12-20260507.151512-19" +protocol-codec = "3.0.0.Beta12-20260507.151512-19" raknet = "1.0.0.CR3-20260421.190401-34" minecraftauth = "5.0.0" mcprotocollib = "26.1-20260404.063343-16" From c31625cc50d70a90bab173349593593504a25d44 Mon Sep 17 00:00:00 2001 From: SleepyPop <81194303+SleepyPopp@users.noreply.github.com> Date: Thu, 7 May 2026 11:37:33 -0400 Subject: [PATCH 5/6] Revert "Apply Chris's recommendation" This reverts commit 4d66ee43517c506fb507fe4ad9edbb4d1fc5c652. --- .../geyser/session/GeyserSession.java | 31 +++++++++---------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java b/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java index 00a39e27d31..3e08e012544 100644 --- a/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java +++ b/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java @@ -878,24 +878,21 @@ public void connect() { maxY = Math.max(maxY, javaDimension.minY() + javaDimension.height()); } } - - if (GameProtocol.is1_26_20orHigher(protocolVersion())) { - minY = Math.max(minY, -512); - maxY = Math.min(maxY, 512); - - if (minY < BedrockDimension.OVERWORLD.minY() || maxY > BedrockDimension.OVERWORLD.maxY()) { - final boolean isInOverworld = this.bedrockDimension == this.bedrockOverworldDimension; - this.bedrockOverworldDimension = new BedrockDimension(minY, maxY - minY, true, BedrockDimension.OVERWORLD_ID); - if (isInOverworld) { - this.bedrockDimension = this.bedrockOverworldDimension; - } - geyser.getLogger().debug("Extending overworld dimension to " + minY + " - " + maxY); - - DimensionDataPacket dimensionDataPacket = new DimensionDataPacket(); - dimensionDataPacket.getDefinitions().add(new DimensionDefinition("minecraft:overworld", maxY, minY, 5 /* Void */)); - upstream.sendPacket(dimensionDataPacket); + /*minY = Math.max(minY, -512); + maxY = Math.min(maxY, 512); + + if (minY < BedrockDimension.OVERWORLD.minY() || maxY > BedrockDimension.OVERWORLD.maxY()) { + final boolean isInOverworld = this.bedrockDimension == this.bedrockOverworldDimension; + this.bedrockOverworldDimension = new BedrockDimension(minY, maxY - minY, true, BedrockDimension.OVERWORLD_ID); + if (isInOverworld) { + this.bedrockDimension = this.bedrockOverworldDimension; } - } + geyser.getLogger().debug("Extending overworld dimension to " + minY + " - " + maxY); + + DimensionDataPacket dimensionDataPacket = new DimensionDataPacket(); + dimensionDataPacket.getDefinitions().add(new DimensionDefinition("minecraft:overworld", maxY, minY, 5 *//* Void *//*)); + upstream.sendPacket(dimensionDataPacket); + }*/ startGame(); sentSpawnPacket = true; From 0457e13839c6f594aa87dc60609df14a8a51e469 Mon Sep 17 00:00:00 2001 From: SleepyPop <81194303+SleepyPopp@users.noreply.github.com> Date: Thu, 7 May 2026 11:40:29 -0400 Subject: [PATCH 6/6] Set dimensionType to 3 --- .../java/org/geysermc/geyser/session/GeyserSession.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java b/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java index 3e08e012544..89f192cb2a6 100644 --- a/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java +++ b/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java @@ -878,7 +878,7 @@ public void connect() { maxY = Math.max(maxY, javaDimension.minY() + javaDimension.height()); } } - /*minY = Math.max(minY, -512); + minY = Math.max(minY, -512); maxY = Math.min(maxY, 512); if (minY < BedrockDimension.OVERWORLD.minY() || maxY > BedrockDimension.OVERWORLD.maxY()) { @@ -890,9 +890,9 @@ public void connect() { geyser.getLogger().debug("Extending overworld dimension to " + minY + " - " + maxY); DimensionDataPacket dimensionDataPacket = new DimensionDataPacket(); - dimensionDataPacket.getDefinitions().add(new DimensionDefinition("minecraft:overworld", maxY, minY, 5 *//* Void *//*)); + dimensionDataPacket.getDefinitions().add(new DimensionDefinition("minecraft:overworld", maxY, minY, 5, 3)); upstream.sendPacket(dimensionDataPacket); - }*/ + } startGame(); sentSpawnPacket = true;