Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-02-11 01:51:37 +01:00
Code Issues Projects Releases Wiki Activity

Blocked access to ColouredConsoleSenders constructor, implemented getConsoleSender

Browse Source 
By: Dinnerbone <dinnerbone@dinnerbone.com>
This commit is contained in:
CraftBukkit/Spigot 2011-09-24 23:14:13 +01:00
parent 86526921b7
commit 7cddc13d28
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java
View File

@ -839,4 +839,8 @@ public final class CraftServer implements Server {
((CraftWorld)world).getHandle().worldData.setGameType(mode.getValue()); ((CraftWorld)world).getHandle().worldData.setGameType(mode.getValue());
} }
} }
public ConsoleCommandSender getConsoleSender() {
return console.console;
}
} }

11
paper-server/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java
View File

@ -5,6 +5,7 @@ import java.util.Map;
import jline.ANSIBuffer.ANSICodes; import jline.ANSIBuffer.ANSICodes;
import jline.ConsoleReader; import jline.ConsoleReader;
import jline.Terminal; import jline.Terminal;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.command.ConsoleCommandSender; import org.bukkit.command.ConsoleCommandSender;
import org.bukkit.craftbukkit.CraftServer; 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 Map<ChatColor, String> replacements = new EnumMap<ChatColor, String>(ChatColor.class);
private final ChatColor[] colors = ChatColor.values(); private final ChatColor[] colors = ChatColor.values();
public ColouredConsoleSender(CraftServer server) { protected ColouredConsoleSender(CraftServer server) {
super(server); super(server);
this.reader = server.getReader(); this.reader = server.getReader();
this.terminal = reader.getTerminal(); this.terminal = reader.getTerminal();
@ -55,4 +56,12 @@ public class ColouredConsoleSender extends ConsoleCommandSender {
super.sendMessage(message); super.sendMessage(message);
} }
} }
public static ConsoleCommandSender getInstance() {
if (Bukkit.getConsoleSender() != null) {
return Bukkit.getConsoleSender();
} else {
return new ColouredConsoleSender((CraftServer)Bukkit.getServer());
}
}
} }