From 16f9f0d94f98b52676f992cfbcb8db48a7808aa1 Mon Sep 17 00:00:00 2001
From: chris <github@onechris.mozmail.com>
Date: Sat, 20 Jan 2024 12:03:32 +0100
Subject: [PATCH] Don't try to show the server settings form to players who are
 not logged in (#4387)

* Don't show the server settings form to players who are not yet logged in

* Add brackets to if statement
---
 .../bedrock/BedrockServerSettingsRequestTranslator.java      | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockServerSettingsRequestTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockServerSettingsRequestTranslator.java
index fb02d7e3e..aa7a2e40f 100644
--- a/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockServerSettingsRequestTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockServerSettingsRequestTranslator.java
@@ -42,6 +42,11 @@ public class BedrockServerSettingsRequestTranslator extends PacketTranslator<Ser
 
     @Override
     public void translate(GeyserSession session, ServerSettingsRequestPacket packet) {
+        // UUID is null when we're not logged in, which causes the hasPermission check to fail
+        if (!session.isLoggedIn()) {
+            return;
+        }
+
         CustomForm form = SettingsUtils.buildForm(session);
         int formId = session.getFormCache().addForm(form);