summaryrefslogtreecommitdiffstats
path: root/nms-patches/DedicatedServer.patch
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2015-07-17 21:18:48 +1000
committermd_5 <git@md-5.net>2015-07-17 21:18:55 +1000
commit3d5ab8fca9d2f6f5c43ae59f3b1e14604c2577f5 (patch)
treed055341ad7fd7c969472eae7968d79ebb16ccdbd /nms-patches/DedicatedServer.patch
parentbf4818b94a4794a38c71d4a79b469e0cab9e35e4 (diff)
downloadcraftbukkit-3d5ab8fca9d2f6f5c43ae59f3b1e14604c2577f5.tar
craftbukkit-3d5ab8fca9d2f6f5c43ae59f3b1e14604c2577f5.tar.gz
craftbukkit-3d5ab8fca9d2f6f5c43ae59f3b1e14604c2577f5.tar.lz
craftbukkit-3d5ab8fca9d2f6f5c43ae59f3b1e14604c2577f5.tar.xz
craftbukkit-3d5ab8fca9d2f6f5c43ae59f3b1e14604c2577f5.zip
SPIGOT-1055: Send empty string when RCON command is cancelled.
Drops the RemoteControlSession patch as the decompiled code is a mess.
Diffstat (limited to 'nms-patches/DedicatedServer.patch')
-rw-r--r--nms-patches/DedicatedServer.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/nms-patches/DedicatedServer.patch b/nms-patches/DedicatedServer.patch
index f00f09b6..b4d15779 100644
--- a/nms-patches/DedicatedServer.patch
+++ b/nms-patches/DedicatedServer.patch
@@ -224,7 +224,7 @@
+ RemoteServerCommandEvent event = new RemoteServerCommandEvent(remoteConsole, s);
+ server.getPluginManager().callEvent(event);
+ if (event.isCancelled()) {
-+ return null;
++ return "";
+ }
+ // Event change end
+ ServerCommand serverCommand = new ServerCommand(event.getCommand(), RemoteControlCommandListener.getInstance());