From 7b39b0d95b8c7f2573d5b26bbcf68330f3ca7892 Mon Sep 17 00:00:00 2001
From: rtm516 <ryantmilner@hotmail.co.uk>
Date: Wed, 24 Jul 2024 22:30:31 +0100
Subject: [PATCH] Allow commands with xbox achievements enabled

---
 .../geyser/configuration/GeyserJacksonConfiguration.java      | 2 +-
 .../translator/protocol/java/JavaCommandsTranslator.java      | 4 ++--
 core/src/main/resources/config.yml                            | 3 +--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/core/src/main/java/org/geysermc/geyser/configuration/GeyserJacksonConfiguration.java b/core/src/main/java/org/geysermc/geyser/configuration/GeyserJacksonConfiguration.java
index 81ac824e4..66a1d20e0 100644
--- a/core/src/main/java/org/geysermc/geyser/configuration/GeyserJacksonConfiguration.java
+++ b/core/src/main/java/org/geysermc/geyser/configuration/GeyserJacksonConfiguration.java
@@ -137,7 +137,7 @@ public abstract class GeyserJacksonConfiguration implements GeyserConfiguration
     private boolean forceResourcePacks = true;
 
     @JsonProperty("xbox-achievements-enabled")
-    private boolean xboxAchievementsEnabled = false;
+    private boolean xboxAchievementsEnabled = true;
 
     @JsonProperty("log-player-ip-addresses")
     private boolean logPlayerIpAddresses = true;
diff --git a/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaCommandsTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaCommandsTranslator.java
index ecfb2d220..84699bfed 100644
--- a/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaCommandsTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaCommandsTranslator.java
@@ -169,8 +169,8 @@ public class JavaCommandsTranslator extends PacketTranslator<ClientboundCommands
             return;
         }
 
-        // The command flags, not sure what these do apart from break things
-        Set<CommandData.Flag> flags = Set.of();
+        // The command flags, set to NOT_CHEAT, so we can enable achievements by default
+        Set<CommandData.Flag> flags = Set.of(CommandData.Flag.NOT_CHEAT);
 
         // Loop through all the found commands
         for (Map.Entry<BedrockCommandInfo, Set<String>> entry : commands.entrySet()) {
diff --git a/core/src/main/resources/config.yml b/core/src/main/resources/config.yml
index fc0cd83f1..63d3362b9 100644
--- a/core/src/main/resources/config.yml
+++ b/core/src/main/resources/config.yml
@@ -168,8 +168,7 @@ above-bedrock-nether-building: false
 force-resource-packs: true
 
 # Allows Xbox achievements to be unlocked.
-# THIS DISABLES ALL COMMANDS FROM SUCCESSFULLY RUNNING FOR BEDROCK IN-GAME, as otherwise Bedrock thinks you are cheating.
-xbox-achievements-enabled: false
+xbox-achievements-enabled: true
 
 # Whether player IP addresses will be logged by the server.
 log-player-ip-addresses: true