SteamWar/Velocity
13
0
Fork 0
geforkt von Mirrors/Velocity
Code Issues Pull-Requests Aktivität

Merge pull request #300 from Leymooo/command-event

Quellcode durchsuchen 
fix command forwarding to server
Dieser Commit ist enthalten in:
Andrew Steinborn 2020-04-29 15:26:29 -04:00 committet von GitHub
Commit 42ad7594ae
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 4AEE18F83AFDEB23
2 geänderte Dateien mit 3 neuen und 3 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

2
api/src/main/java/com/velocitypowered/api/event/command/CommandExecuteEvent.java
Datei anzeigen

@ -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
Datei anzeigen

@ -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(),