summaryrefslogtreecommitdiffstats
path: root/src/main/java/net
diff options
context:
space:
mode:
authorTravis Watkins <amaranth@ubuntu.com>2013-12-01 13:21:22 -0600
committerTravis Watkins <amaranth@ubuntu.com>2013-12-01 13:21:22 -0600
commit6aafe7c5a10d522efbbbc671aa831062f4b57e44 (patch)
treee2a546262213a9b839ed74c9cbafa087d7d2b130 /src/main/java/net
parentd48bcbe64203a95dbb55d6786ceb3549c5699cdc (diff)
downloadcraftbukkit-6aafe7c5a10d522efbbbc671aa831062f4b57e44.tar
craftbukkit-6aafe7c5a10d522efbbbc671aa831062f4b57e44.tar.gz
craftbukkit-6aafe7c5a10d522efbbbc671aa831062f4b57e44.tar.lz
craftbukkit-6aafe7c5a10d522efbbbc671aa831062f4b57e44.tar.xz
craftbukkit-6aafe7c5a10d522efbbbc671aa831062f4b57e44.zip
Make console work on Windows again. Fixes BUKKIT-4956
Something the log4j ConsoleAppender does makes the console work correctly on Windows. After trying to pull pieces of it out and run them manually I decided to just put the appender back. We now once again start with the ConsoleAppender then remove it immediately after starting.
Diffstat (limited to 'src/main/java/net')
-rw-r--r--src/main/java/net/minecraft/server/DedicatedServer.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
index 1b116878..30ce5f48 100644
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -55,6 +55,12 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
global.addHandler(new org.bukkit.craftbukkit.util.ForwardLogHandler());
final org.apache.logging.log4j.core.Logger logger = ((org.apache.logging.log4j.core.Logger) LogManager.getRootLogger());
+ for (org.apache.logging.log4j.core.Appender appender : logger.getAppenders().values()) {
+ if (appender instanceof org.apache.logging.log4j.core.appender.ConsoleAppender) {
+ logger.removeAppender(appender);
+ }
+ }
+
new Thread(new org.bukkit.craftbukkit.util.TerminalConsoleWriterThread(System.out, this.reader)).start();
System.setOut(new PrintStream(new LoggerOutputStream(logger, Level.INFO), true));