From 9e203d48aa7c0848a50a8041282a19b48a4fe793 Mon Sep 17 00:00:00 2001
From: RednedEpic <redned235@gmail.com>
Date: Fri, 6 Mar 2020 19:37:35 -0600
Subject: [PATCH] Fix running Geyser commands ingame

---
 .../bedrock/BedrockCommandRequestTranslator.java            | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockCommandRequestTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockCommandRequestTranslator.java
index 19d1a55f..8091781a 100644
--- a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockCommandRequestTranslator.java
+++ b/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockCommandRequestTranslator.java
@@ -29,6 +29,7 @@ import com.github.steveice10.mc.protocol.packet.ingame.client.ClientChatPacket;
 import com.nukkitx.protocol.bedrock.packet.CommandRequestPacket;
 
 import org.geysermc.connector.GeyserConnector;
+import org.geysermc.connector.command.GeyserCommandMap;
 import org.geysermc.connector.network.session.GeyserSession;
 import org.geysermc.connector.network.translators.PacketTranslator;
 
@@ -37,8 +38,9 @@ public class BedrockCommandRequestTranslator extends PacketTranslator<CommandReq
     @Override
     public void translate(CommandRequestPacket packet, GeyserSession session) {
         String command = packet.getCommand().replace("/", "");
-        if (GeyserConnector.getInstance().getCommandMap().getCommands().containsKey(command)) {
-            GeyserConnector.getInstance().getCommandMap().runCommand(session, command);
+        GeyserCommandMap commandMap = GeyserConnector.getInstance().getCommandMap();
+        if (command.startsWith("geyser ") && commandMap.getCommands().containsKey(command.split(" ")[1])) {
+            commandMap.runCommand(session, command);
         } else {
             ClientChatPacket chatPacket = new ClientChatPacket(packet.getCommand());
             session.getDownstream().getSession().send(chatPacket);