Blocked access to ColouredConsoleSenders constructor, implemented getConsoleSender

2 files changed, 14 insertions, 1 deletions

diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 9129b58e..482405c9 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -839,4 +839,8 @@ public final class CraftServer implements Server {
             ((CraftWorld)world).getHandle().worldData.setGameType(mode.getValue());
         }
     }
+
+    public ConsoleCommandSender getConsoleSender() {
+        return console.console;
+    }
 }
diff --git a/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java b/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java
index 4dabe6f0..28f252e1 100644
--- a/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java
+++ b/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java
@@ -5,6 +5,7 @@ import java.util.Map;
 import jline.ANSIBuffer.ANSICodes;
 import jline.ConsoleReader;
 import jline.Terminal;
+import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.command.ConsoleCommandSender;
 import org.bukkit.craftbukkit.CraftServer;
@@ -15,7 +16,7 @@ public class ColouredConsoleSender extends ConsoleCommandSender {
     private final Map<ChatColor, String> replacements = new EnumMap<ChatColor, String>(ChatColor.class);
     private final ChatColor[] colors = ChatColor.values();
 
-    public ColouredConsoleSender(CraftServer server) {
+    protected ColouredConsoleSender(CraftServer server) {
         super(server);
         this.reader = server.getReader();
         this.terminal = reader.getTerminal();
@@ -55,4 +56,12 @@ public class ColouredConsoleSender extends ConsoleCommandSender {
             super.sendMessage(message);
         }
     }
+
+    public static ConsoleCommandSender getInstance() {
+        if (Bukkit.getConsoleSender() != null) {
+            return Bukkit.getConsoleSender();
+        } else {
+            return new ColouredConsoleSender((CraftServer)Bukkit.getServer());
+        }
+    }
 }