diff options
| author | md_5 <git@md-5.net> | 2015-07-13 16:45:38 +1000 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2015-07-13 16:45:38 +1000 |
| commit | 55589cd3631dfdae0a6f04e8ae33ff6754a752e1 (patch) | |
| tree | 9b691eaa4aa95f093245f42ad45972e0dbba3100 | |
| parent | 2359f6fcb0190f8f4310e6174812df51743c2057 (diff) | |
| download | craftbukkit-55589cd3631dfdae0a6f04e8ae33ff6754a752e1.tar craftbukkit-55589cd3631dfdae0a6f04e8ae33ff6754a752e1.tar.gz craftbukkit-55589cd3631dfdae0a6f04e8ae33ff6754a752e1.tar.lz craftbukkit-55589cd3631dfdae0a6f04e8ae33ff6754a752e1.tar.xz craftbukkit-55589cd3631dfdae0a6f04e8ae33ff6754a752e1.zip | |
SPIGOT-1047: Fix RCON.
Result of staging the file -> decompiler issues.
| -rw-r--r-- | nms-patches/RemoteControlSession.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/nms-patches/RemoteControlSession.patch b/nms-patches/RemoteControlSession.patch index 7bdd3e83..4c1fcfd0 100644 --- a/nms-patches/RemoteControlSession.patch +++ b/nms-patches/RemoteControlSession.patch @@ -1,5 +1,16 @@ --- 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); @@ -12,3 +23,29 @@ } 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 + + } + |