From 1fb382e0f6b4fcb7c2100cabe0a284ce01862e89 Mon Sep 17 00:00:00 2001 From: Leymooo Date: Mon, 27 Apr 2020 00:09:25 +0300 Subject: [PATCH] fix logic --- .../client/ClientPlaySessionHandler.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ClientPlaySessionHandler.java b/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ClientPlaySessionHandler.java index f1bbaf1c8..9c22e9c2c 100644 --- a/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ClientPlaySessionHandler.java +++ b/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ClientPlaySessionHandler.java @@ -128,15 +128,13 @@ public class ClientPlaySessionHandler implements MinecraftSessionHandler { server.getCommandManager().callCommandEvent(player, msg.substring(1)) .thenAcceptAsync(event -> { CommandExecuteEvent.CommandResult commandResult = event.getResult(); + Optional eventCommand = event.getResult().getCommand(); + String command = eventCommand.orElse(event.getCommand()); + if (commandResult.isForwardToServer()) { + smc.write(Chat.createServerbound(command)); + return; + } if (commandResult.isAllowed()) { - Optional eventCommand = event.getResult().getCommand(); - String command = eventCommand.orElse(event.getCommand()); - - if (commandResult.isForwardToServer()) { - smc.write(Chat.createServerbound(command)); - return; - } - try { if (!server.getCommandManager().execute(player, command)) { smc.write(Chat.createServerbound(command));