summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNathan Adams <dinnerbone@dinnerbone.com>2012-01-14 17:12:45 +0000
committerNathan Adams <dinnerbone@dinnerbone.com>2012-01-14 17:12:45 +0000
commit743c623d538aa6edfbe00ffdf3d6f72671298953 (patch)
tree1157b7b2b88b88ec61f02aa4d3b3c8ce49639a4a /src
parent6cc56b8c2ccd6ae3b01aac549ca2a1c694818065 (diff)
downloadcraftbukkit-743c623d538aa6edfbe00ffdf3d6f72671298953.tar
craftbukkit-743c623d538aa6edfbe00ffdf3d6f72671298953.tar.gz
craftbukkit-743c623d538aa6edfbe00ffdf3d6f72671298953.tar.lz
craftbukkit-743c623d538aa6edfbe00ffdf3d6f72671298953.tar.xz
craftbukkit-743c623d538aa6edfbe00ffdf3d6f72671298953.zip
Modified ConsoleReader to use System.in instead of FileDescriptor.in. Big thanks to escortkeel for the (unfortunately very old) PR.
Diffstat (limited to 'src')
-rw-r--r--src/main/java/net/minecraft/server/MinecraftServer.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 0633a0f2..882b0732 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -15,6 +15,7 @@ import java.util.logging.Logger;
// CraftBukkit start
import java.io.PrintStream;
+import java.io.PrintWriter;
import java.net.UnknownHostException;
import jline.ConsoleReader;
import joptsimple.OptionSet;
@@ -82,7 +83,7 @@ public class MinecraftServer implements Runnable, ICommandListener, IMinecraftSe
// CraftBukkit start
this.options = options;
try {
- this.reader = new ConsoleReader();
+ this.reader = new ConsoleReader(System.in, new PrintWriter(System.out)); // CraftBukkit - Added "System.in, new PrintWriter(System.out)" in the constuctor
} catch (IOException ex) {
Logger.getLogger(MinecraftServer.class.getName()).log(Level.SEVERE, null, ex);
}