diff options
author | Thinkofdeath <thinkofdeath@spigotmc.org> | 2015-02-26 22:41:06 +0000 |
---|---|---|
committer | Thinkofdeath <thinkofdeath@spigotmc.org> | 2015-03-04 09:48:58 +0000 |
commit | d8a9c7be4227b2243968b63ab7cc7a00098c93ad (patch) | |
tree | 554a08a5f23ffa5dd66a28247d6358515b1ffb7a /nms-patches/ThreadCommandReader.patch | |
parent | 33d5de312e9fcc8aec3fc53136658cb6920562aa (diff) | |
download | craftbukkit-d8a9c7be4227b2243968b63ab7cc7a00098c93ad.tar craftbukkit-d8a9c7be4227b2243968b63ab7cc7a00098c93ad.tar.gz craftbukkit-d8a9c7be4227b2243968b63ab7cc7a00098c93ad.tar.lz craftbukkit-d8a9c7be4227b2243968b63ab7cc7a00098c93ad.tar.xz craftbukkit-d8a9c7be4227b2243968b63ab7cc7a00098c93ad.zip |
Update to Minecraft 1.8.3
Diffstat (limited to 'nms-patches/ThreadCommandReader.patch')
-rw-r--r-- | nms-patches/ThreadCommandReader.patch | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/nms-patches/ThreadCommandReader.patch b/nms-patches/ThreadCommandReader.patch deleted file mode 100644 index 02cbab44..00000000 --- a/nms-patches/ThreadCommandReader.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- ../work/decompile-8eb82bde//net/minecraft/server/ThreadCommandReader.java 2014-11-28 17:43:43.385707429 +0000 -+++ src/main/java/net/minecraft/server/ThreadCommandReader.java 2014-11-28 17:38:18.000000000 +0000 -@@ -4,6 +4,8 @@ - import java.io.IOException; - import java.io.InputStreamReader; - -+import static org.bukkit.craftbukkit.Main.*; // CraftBukkit -+ - class ThreadCommandReader extends Thread { - - final DedicatedServer server; -@@ -14,13 +16,28 @@ - } - - public void run() { -- BufferedReader bufferedreader = new BufferedReader(new InputStreamReader(System.in)); -+ // CraftBukkit start -+ if (!useConsole) { -+ return; -+ } -+ // CraftBukkit end -+ -+ jline.console.ConsoleReader bufferedreader = this.server.reader; // CraftBukkit - - String s; - - try { -- while (!this.server.isStopped() && this.server.isRunning() && (s = bufferedreader.readLine()) != null) { -- this.server.issueCommand(s, this.server); -+ // CraftBukkit start - JLine disabling compatibility -+ while (!this.server.isStopped() && this.server.isRunning()) { -+ if (useJline) { -+ s = bufferedreader.readLine(">", null); -+ } else { -+ s = bufferedreader.readLine(); -+ } -+ if (s != null && s.trim().length() > 0) { // Trim to filter lines which are just spaces -+ this.server.issueCommand(s, this.server); -+ } -+ // CraftBukkit end - } - } catch (IOException ioexception) { - DedicatedServer.aR().error("Exception handling console input", ioexception); |