Added command line option 'date-format' to control how dates are printed to console (not to log)

2 files changed, 5 insertions, 4 deletions

diff --git a/src/main/java/net/minecraft/server/ConsoleLogManager.java b/src/main/java/net/minecraft/server/ConsoleLogManager.java
index 641c8ca7..53308077 100644
--- a/src/main/java/net/minecraft/server/ConsoleLogManager.java
+++ b/src/main/java/net/minecraft/server/ConsoleLogManager.java
@@ -1,5 +1,6 @@
 package net.minecraft.server;
 
+import java.text.SimpleDateFormat;
 import java.util.logging.ConsoleHandler;
 import java.util.logging.FileHandler;
 import java.util.logging.Level;
@@ -18,11 +19,11 @@ public class ConsoleLogManager {
     public ConsoleLogManager() {}
 
     // Craftbukkit - change of method signature!
-    public static void a(ConsoleReader reader) {
+    public static void a(MinecraftServer server) {
         ConsoleLogFormatter consolelogformatter = new ConsoleLogFormatter();
 
         a.setUseParentHandlers(false);
-        ConsoleHandler consolehandler = new TerminalConsoleHandler(reader);
+        ConsoleHandler consolehandler = new TerminalConsoleHandler(server.reader); // Craftbukkit
 
         // CraftBukkit start
         for (Handler handler: global.getHandlers()) {
@@ -30,7 +31,7 @@ public class ConsoleLogManager {
         }
         // CraftBukkit end
 
-        consolehandler.setFormatter(new ShortConsoleLogFormatter()); // Craftbukkit
+        consolehandler.setFormatter(new ShortConsoleLogFormatter(server)); // Craftbukkit
         a.addHandler(consolehandler);
         global.addHandler(consolehandler); // CraftBukkit
 
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index b9e6ff0b..8127ac03 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -75,7 +75,7 @@ public class MinecraftServer implements Runnable, ICommandListener {
 
         threadcommandreader.setDaemon(true);
         threadcommandreader.start();
-        ConsoleLogManager.a(reader); // Craftbukkit
+        ConsoleLogManager.a(this); // Craftbukkit
 
         // CraftBukkit start
         System.setOut(new PrintStream(new LoggerOutputStream(a, Level.INFO), true));