summaryrefslogtreecommitdiffstats
path: root/nms-patches
diff options
context:
space:
mode:
authorThinkofdeath <thinkofdeath@spigotmc.org>2015-06-11 12:59:36 +0100
committerThinkofdeath <thinkofdeath@spigotmc.org>2015-06-11 12:59:36 +0100
commitb023c53e0312bb0e2224cd0405728b3a66f86bd5 (patch)
treeb0051d92502428dc082c1eee8d8ab12723ceb14e /nms-patches
parent1880a9c0b69523a09917d2baffc634ddf506cabb (diff)
downloadcraftbukkit-b023c53e0312bb0e2224cd0405728b3a66f86bd5.tar
craftbukkit-b023c53e0312bb0e2224cd0405728b3a66f86bd5.tar.gz
craftbukkit-b023c53e0312bb0e2224cd0405728b3a66f86bd5.tar.lz
craftbukkit-b023c53e0312bb0e2224cd0405728b3a66f86bd5.tar.xz
craftbukkit-b023c53e0312bb0e2224cd0405728b3a66f86bd5.zip
Allow for the jline console to be overriden in normally unsupported enviroments
Diffstat (limited to 'nms-patches')
-rw-r--r--nms-patches/MinecraftServer.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/nms-patches/MinecraftServer.patch b/nms-patches/MinecraftServer.patch
index 7902a219..3e666e76 100644
--- a/nms-patches/MinecraftServer.patch
+++ b/nms-patches/MinecraftServer.patch
@@ -54,7 +54,7 @@
+ // CraftBukkit start
+ this.options = options;
+ // Try to see if we're actually running in a terminal, disable jline if not
-+ if (System.console() == null) {
++ if (System.console() == null && System.getProperty("jline.terminal") == null) {
+ System.setProperty("jline.terminal", "jline.UnsupportedTerminal");
+ Main.useJline = false;
+ }