twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-16 04:33:56 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update to jline 2. Fixes BUKKIT-717

Browse Source 
JLine 2 allows for better color matching in the console and support for
colors in console on Windows. Hopefully provides better performance as well.
This commit is contained in:
EdGruberman
2012-03-14 13:59:14 -07:00
committed by Travis Watkins
parent cbd20ec9ea
commit 31d488a386
6 changed files with 46 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/net/minecraft/server/MinecraftServer.java
View File

@@ -16,7 +16,7 @@ import java.util.logging.Logger;
import java.io.PrintStream;
import java.io.PrintWriter;
import java.net.UnknownHostException;
import jline.ConsoleReader;
import jline.console.ConsoleReader;
import joptsimple.OptionSet;
import org.bukkit.World.Environment;
import org.bukkit.command.ConsoleCommandSender;
@@ -91,7 +91,8 @@ public class MinecraftServer implements Runnable, ICommandListener, IMinecraftSe
// CraftBukkit start
this.options = options;
try {
this.reader = new ConsoleReader(System.in, new PrintWriter(System.out)); // CraftBukkit - Added "System.in, new PrintWriter(System.out)" in the constuctor
this.reader = new ConsoleReader(System.in, System.out);
this.reader.setExpandEvents(false); // Avoid parsing exceptions for uncommonly used event designators
} catch (IOException ex) {
Logger.getLogger(MinecraftServer.class.getName()).log(Level.SEVERE, null, ex);
}
@@ -478,6 +479,12 @@ public class MinecraftServer implements Runnable, ICommandListener, IMinecraftSe
try {
this.stop();
this.isStopped = true;
// CraftBukkit start - restore terminal to original settings
try {
this.reader.getTerminal().restore();
} catch (Exception e) {
}
// CraftBukkit end
} catch (Throwable throwable1) {
throwable1.printStackTrace();
} finally {