diff options
author | EvilSeph <evilseph@unaligned.org> | 2011-05-18 15:23:27 -0400 |
---|---|---|
committer | EvilSeph <evilseph@unaligned.org> | 2011-05-18 21:36:30 -0400 |
commit | eac5b9623d771abd3ea480eaeb33404b4410d3b6 (patch) | |
tree | 5c9e86e41b4b35494cdb14a266495f90a8146a91 /src/main/java/net/minecraft | |
parent | cd87e51638048e2376a1e882d6f75be092eb8479 (diff) | |
download | craftbukkit-eac5b9623d771abd3ea480eaeb33404b4410d3b6.tar craftbukkit-eac5b9623d771abd3ea480eaeb33404b4410d3b6.tar.gz craftbukkit-eac5b9623d771abd3ea480eaeb33404b4410d3b6.tar.lz craftbukkit-eac5b9623d771abd3ea480eaeb33404b4410d3b6.tar.xz craftbukkit-eac5b9623d771abd3ea480eaeb33404b4410d3b6.zip |
Added -nojline CLI option to emulate vanilla console behaviours. Added JLine disabling compatibility (removes the '>').
-nojline disables JLine, removes the '>', sets the timestamp to vanilla's and sets the language to English.
-Djline.terminal=jline.UnsupportedTerminal disables JLine and removes the '>'.
Diffstat (limited to 'src/main/java/net/minecraft')
-rw-r--r-- | src/main/java/net/minecraft/server/ThreadCommandReader.java | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/src/main/java/net/minecraft/server/ThreadCommandReader.java b/src/main/java/net/minecraft/server/ThreadCommandReader.java index f3d36e65..0158e96a 100644 --- a/src/main/java/net/minecraft/server/ThreadCommandReader.java +++ b/src/main/java/net/minecraft/server/ThreadCommandReader.java @@ -19,14 +19,24 @@ public class ThreadCommandReader extends Thread { } public void run() { - // CraftBukkit + // CraftBukkit start ConsoleReader bufferedreader = this.server.reader; String s = null; + String jlineTerminalSetting = org.bukkit.craftbukkit.Main.jlineTerminalSetting; + // CraftBukkit end try { - // CraftBukkit - while (!this.server.isStopped && MinecraftServer.isRunning(this.server) && ((s = bufferedreader.readLine(">", null)) != null)) { - this.server.issueCommand(s, this.server); + while (!this.server.isStopped && MinecraftServer.isRunning(this.server)) { + // CraftBukkit start - JLine disabling compatibility + if (jlineTerminalSetting != null && jlineTerminalSetting.equals("jline.UnsupportedTerminal")) { + s = bufferedreader.readLine(); + } else { + s = bufferedreader.readLine(">", null); + } + if (s != null) { + // CraftBukkit end + this.server.issueCommand(s, this.server); + } } } catch (IOException ioexception) { // CraftBukkit |