summaryrefslogtreecommitdiffstats
path: root/src/main/java/org
diff options
context:
space:
mode:
authorzreed <zach@digitalforgemc.com>2014-12-06 13:55:50 -0500
committermd_5 <git@md-5.net>2014-12-12 11:06:13 +1100
commit45be36a7b85249a50872e8db1d44a14ebd1724b6 (patch)
treedb1bb535e0c3896728430b25f69022309a28fad5 /src/main/java/org
parent2dda1b33b0238996e5838f7f757e2f2d103481db (diff)
downloadcraftbukkit-45be36a7b85249a50872e8db1d44a14ebd1724b6.tar
craftbukkit-45be36a7b85249a50872e8db1d44a14ebd1724b6.tar.gz
craftbukkit-45be36a7b85249a50872e8db1d44a14ebd1724b6.tar.lz
craftbukkit-45be36a7b85249a50872e8db1d44a14ebd1724b6.tar.xz
craftbukkit-45be36a7b85249a50872e8db1d44a14ebd1724b6.zip
Update JLine
Later releases include the TerminalLineSettings patch. Also move call to AnsiConsole.systemInstall() to avoid patching AnsiWindowsTerminal.
Diffstat (limited to 'src/main/java/org')
-rw-r--r--src/main/java/org/bukkit/craftbukkit/Main.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index 8d127fbe..9ffd8977 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -10,6 +10,7 @@ import java.util.logging.Logger;
import joptsimple.OptionParser;
import joptsimple.OptionSet;
import net.minecraft.server.MinecraftServer;
+import org.fusesource.jansi.AnsiConsole;
public class Main {
public static boolean useJline = true;
@@ -145,7 +146,9 @@ public class Main {
useJline = false;
}
- if (!useJline) {
+ if (useJline) {
+ AnsiConsole.systemInstall();
+ } else {
// This ensures the terminal literal will always match the jline implementation
System.setProperty(jline.TerminalFactory.JLINE_TERMINAL, jline.UnsupportedTerminal.class.getName());
}