From 5e8651df4c85a300fb16d88f810e2ff9be1ef390 Mon Sep 17 00:00:00 2001
From: CraftBukkit/Spigot <noreply+git-craftbukkit@papermc.io>
Date: Sat, 6 Dec 2014 13:55:50 -0500
Subject: [PATCH] Update JLine

Later releases include the TerminalLineSettings patch. Also move call to AnsiConsole.systemInstall() to avoid patching AnsiWindowsTerminal.

By: zreed <zach@digitalforgemc.com>
---
 paper-server/pom.xml                                        | 2 +-
 paper-server/src/main/java/org/bukkit/craftbukkit/Main.java | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/paper-server/pom.xml b/paper-server/pom.xml
index e4aff848d..49f802803 100644
--- a/paper-server/pom.xml
+++ b/paper-server/pom.xml
@@ -57,7 +57,7 @@
     <dependency>
       <groupId>jline</groupId>
       <artifactId>jline</artifactId>
-      <version>2.6</version>
+      <version>2.12</version>
       <type>jar</type>
       <scope>compile</scope>
     </dependency>
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/Main.java b/paper-server/src/main/java/org/bukkit/craftbukkit/Main.java
index 8d127fbe2..9ffd89779 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/paper-server/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());
                 }