From efc7e43e02c5f6882fc6d8659ad8e1f8eb46c657 Mon Sep 17 00:00:00 2001
From: rtm516 <rtm516@users.noreply.github.com>
Date: Mon, 8 Mar 2021 22:00:44 +0000
Subject: [PATCH] Fix settings not displaying due to bedrock bug by delaying 1s
 (#2010)

* Fix settings not displaying due to bedrock bug by delaying 1s

* Update BedrockServerSettingsRequestTranslator.java
---
 .../BedrockServerSettingsRequestTranslator.java     | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockServerSettingsRequestTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockServerSettingsRequestTranslator.java
index 997bba8aa..3f3226280 100644
--- a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockServerSettingsRequestTranslator.java
+++ b/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockServerSettingsRequestTranslator.java
@@ -32,6 +32,8 @@ import org.geysermc.connector.network.translators.PacketTranslator;
 import org.geysermc.connector.network.translators.Translator;
 import org.geysermc.connector.utils.SettingsUtils;
 
+import java.util.concurrent.TimeUnit;
+
 @Translator(packet = ServerSettingsRequestPacket.class)
 public class BedrockServerSettingsRequestTranslator extends PacketTranslator<ServerSettingsRequestPacket> {
 
@@ -39,9 +41,12 @@ public class BedrockServerSettingsRequestTranslator extends PacketTranslator<Ser
     public void translate(ServerSettingsRequestPacket packet, GeyserSession session) {
         SettingsUtils.buildForm(session);
 
-        ServerSettingsResponsePacket serverSettingsResponsePacket = new ServerSettingsResponsePacket();
-        serverSettingsResponsePacket.setFormData(session.getSettingsForm().getJSONData());
-        serverSettingsResponsePacket.setFormId(SettingsUtils.SETTINGS_FORM_ID);
-        session.sendUpstreamPacket(serverSettingsResponsePacket);
+        // Fixes https://bugs.mojang.com/browse/MCPE-94012 because of the delay
+        session.getConnector().getGeneralThreadPool().schedule(() -> {
+            ServerSettingsResponsePacket serverSettingsResponsePacket = new ServerSettingsResponsePacket();
+            serverSettingsResponsePacket.setFormData(session.getSettingsForm().getJSONData());
+            serverSettingsResponsePacket.setFormId(SettingsUtils.SETTINGS_FORM_ID);
+            session.sendUpstreamPacket(serverSettingsResponsePacket);
+        }, 1, TimeUnit.SECONDS);
     }
 }