diff options
| author | md_5 <git@md-5.net> | 2015-07-17 21:18:48 +1000 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2015-07-17 21:18:55 +1000 |
| commit | 3d5ab8fca9d2f6f5c43ae59f3b1e14604c2577f5 (patch) | |
| tree | d055341ad7fd7c969472eae7968d79ebb16ccdbd | |
| parent | bf4818b94a4794a38c71d4a79b469e0cab9e35e4 (diff) | |
| download | craftbukkit-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.
| -rw-r--r-- | nms-patches/DedicatedServer.patch | 2 | ||||
| -rw-r--r-- | nms-patches/RemoteControlSession.patch | 51 |
2 files changed, 1 insertions, 52 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()); diff --git a/nms-patches/RemoteControlSession.patch b/nms-patches/RemoteControlSession.patch deleted file mode 100644 index 4c1fcfd0..00000000 --- a/nms-patches/RemoteControlSession.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- a/net/minecraft/server/RemoteControlSession.java -+++ b/net/minecraft/server/RemoteControlSession.java -@@ -32,8 +32,8 @@ - } - - public void run() { -- while (true) { -- try { -+ try { // CraftBukkit // PAIL: FF issue -+ while (true) { // CraftBukkit // PAIL: FF issue - if (!this.a) { - break; - } -@@ -62,7 +62,10 @@ - String s = StatusChallengeUtils.a(this.k, k, i); - - try { -- this.a(l, this.b.executeRemoteCommand(s)); -+ // CraftBukkit start -+ String result = this.b.executeRemoteCommand(s); -+ if (result != null) this.a(l, result); -+ // CraftBukkit end - } catch (Exception exception) { - this.a(l, "Error executing: " + s + " (" + exception.getMessage() + ")"); - } -@@ -90,20 +93,20 @@ - this.a(l, String.format("Unknown request %s", new Object[] { Integer.toHexString(i1)})); - continue; - } -- } -+ } } - } catch (SocketTimeoutException sockettimeoutexception) { -- break; -+ // break; // CraftBukkit // PAIL: FF issue - } catch (IOException ioexception) { -- break; -+ // break; // CraftBukkit // PAIL: FF issue - } catch (Exception exception1) { - RemoteControlSession.h.error("Exception whilst parsing RCON input", exception1); -- break; -+ // break; // CraftBukkit // PAIL: FF issue - } finally { - this.g(); - } - - return; -- } -+ // } // CraftBukkit // PAIL: FF issue - - } - |