From 8fe102c2ffa84b2b2ca9400a7d2e1748eff38704 Mon Sep 17 00:00:00 2001
From: Eclipse <eclipse@eclipseisoffline.xyz>
Date: Fri, 6 Jun 2025 11:53:01 +0000
Subject: [PATCH] Turn daylight cycle off when showing configuration dialog,
 send empty chunks when starting configuration

---
 .../main/java/org/geysermc/geyser/session/GeyserSession.java  | 2 +-
 .../protocol/java/JavaStartConfigurationTranslator.java       | 3 +++
 .../dialogues/JavaShowDialogueConfigurationTranslator.java    | 4 ++++
 3 files changed, 8 insertions(+), 1 deletion(-)

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 a6b32a1db..009d3841d 100644
--- a/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java
+++ b/core/src/main/java/org/geysermc/geyser/session/GeyserSession.java
@@ -1823,7 +1823,7 @@ public class GeyserSession implements GeyserConnection, GeyserCommandSource {
 
     /**
      * Changes the daylight cycle gamerule on the client
-     * This is used in the login screen along-side normal usage
+     * This is used in login and configuration screens along-side normal usage
      *
      * @param doCycle If the cycle should continue
      */
diff --git a/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaStartConfigurationTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaStartConfigurationTranslator.java
index 08d147a26..ca0c2d047 100644
--- a/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaStartConfigurationTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaStartConfigurationTranslator.java
@@ -29,6 +29,7 @@ import org.geysermc.geyser.erosion.GeyserboundHandshakePacketHandler;
 import org.geysermc.geyser.session.GeyserSession;
 import org.geysermc.geyser.translator.protocol.PacketTranslator;
 import org.geysermc.geyser.translator.protocol.Translator;
+import org.geysermc.geyser.util.ChunkUtils;
 import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.ClientboundStartConfigurationPacket;
 
 @Translator(packet = ClientboundStartConfigurationPacket.class)
@@ -42,5 +43,7 @@ public class JavaStartConfigurationTranslator extends PacketTranslator<Clientbou
             session.setErosionHandler(new GeyserboundHandshakePacketHandler(session));
             erosionHandler.close();
         }
+
+        ChunkUtils.sendEmptyChunks(session, session.getPlayerEntity().position().toInt(), session.getServerRenderDistance(), false);
     }
 }
diff --git a/core/src/main/java/org/geysermc/geyser/translator/protocol/java/dialogues/JavaShowDialogueConfigurationTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/dialogues/JavaShowDialogueConfigurationTranslator.java
index c3663f033..526394420 100644
--- a/core/src/main/java/org/geysermc/geyser/translator/protocol/java/dialogues/JavaShowDialogueConfigurationTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/dialogues/JavaShowDialogueConfigurationTranslator.java
@@ -39,6 +39,10 @@ public class JavaShowDialogueConfigurationTranslator extends PacketTranslator<Cl
         if (!session.isSentSpawnPacket()) {
             session.connect();
         }
+
+        // Disable time progression whilst the dialog is open
+        // Once logged into the game this is set correctly when receiving a time packet from the server
+        session.setDaylightCycle(false);
         session.getDialogManager().openDialog(Holder.ofCustom(packet.getDialog()));
     }
 }