From 3d5ab8fca9d2f6f5c43ae59f3b1e14604c2577f5 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Fri, 17 Jul 2015 21:18:48 +1000
Subject: SPIGOT-1055: Send empty string when RCON command is cancelled.

Drops the RemoteControlSession patch as the decompiled code is a mess.
---
 nms-patches/DedicatedServer.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nms-patches/DedicatedServer.patch')

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());
-- 
cgit v1.2.3