MiniDay/Velocity
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Merge pull request #300 from Leymooo/command-event

Browse Source 
fix command forwarding to server
This commit is contained in:
Andrew Steinborn
2020-04-29 15:26:29 -04:00
committed by GitHub
parent e759668f53 d096eb3429
commit 42ad7594ae
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/main/java/com/velocitypowered/api/event/command/CommandExecuteEvent.java
View File

@@ -9,7 +9,7 @@ import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.checker.nullness.qual.Nullable; import org.checkerframework.checker.nullness.qual.Nullable;
/** /**
* This event is fired when a player types in a chat message. * This event is fired when someone executing command
*/ */
public final class CommandExecuteEvent implements ResultedEvent<CommandResult> { public final class CommandExecuteEvent implements ResultedEvent<CommandResult> {

4
proxy/src/main/java/com/velocitypowered/proxy/connection/client/ClientPlaySessionHandler.java
View File

@@ -131,13 +131,13 @@ public class ClientPlaySessionHandler implements MinecraftSessionHandler {
Optional<String> eventCommand = event.getResult().getCommand(); Optional<String> eventCommand = event.getResult().getCommand();
String command = eventCommand.orElse(event.getCommand()); String command = eventCommand.orElse(event.getCommand());
if (commandResult.isForwardToServer()) { if (commandResult.isForwardToServer()) {
smc.write(Chat.createServerbound(command)); smc.write(Chat.createServerbound("/" + command));
return; return;
} }
if (commandResult.isAllowed()) { if (commandResult.isAllowed()) {
try { try {
if (!server.getCommandManager().executeImmediately(player, command)) { if (!server.getCommandManager().executeImmediately(player, command)) {
smc.write(Chat.createServerbound(command)); smc.write(Chat.createServerbound("/" + command));
} }
} catch (Exception e) { } catch (Exception e) {
logger.info("Exception occurred while running command for {}", player.getUsername(), logger.info("Exception occurred while running command for {}", player.getUsername(),