Fix issue with chat colors...

This commit is contained in:
Gary Smoak 2011-09-23 20:00:44 -04:00
parent 620fb4b9ef
commit fb77c50bcd
3 changed files with 7 additions and 9 deletions

View file

@ -34,7 +34,6 @@ import org.bukkit.util.config.ConfigurationNode;
public class MCTelnet extends JavaPlugin {
private ServerSocket listenerSocket;
private ArrayList<TelnetListener> clientHolder;
private MinecraftServer mcserv;
private Thread listenerThread;
private boolean run = false;
int port = 8765;
@ -107,7 +106,6 @@ public class MCTelnet extends JavaPlugin {
listenerThread.start();
Field cfield = CraftServer.class.getDeclaredField("console");
cfield.setAccessible(true);
mcserv = (MinecraftServer) cfield.get((CraftServer)getServer());
Logger.getLogger("Minecraft").log(Level.INFO,"[MCTelnet] - Listening on: " + listenerSocket.getInetAddress().getHostAddress() + ":" + port);
} catch (Exception ex) {
Logger.getLogger("Minecraft").log(Level.SEVERE, "[MCTelnet] - Unable to Enable! Error: " + ex.getMessage());
@ -168,7 +166,7 @@ public class MCTelnet extends JavaPlugin {
Socket client = listenerSocket.accept();
if(client != null)
{
clientHolder.add(new TelnetListener(client,mcserv,this));
clientHolder.add(new TelnetListener(client,this));
System.out.print("[MCTelnet] - Client connected: " + client.getInetAddress().toString());
}
for(int i = 0; i < clientHolder.size(); i++)
@ -188,7 +186,6 @@ public class MCTelnet extends JavaPlugin {
temp.killClient();
}
listenerSocket = null;
mcserv = null;
clientHolder.clear();
clientHolder = null;
this.setEnabled(false);

View file

@ -17,6 +17,7 @@ import java.util.logging.Level;
import java.util.logging.LogRecord;
import java.util.logging.Logger;
import net.minecraft.server.MinecraftServer;
import org.bukkit.ChatColor;
import org.bukkit.Server;
import org.bukkit.command.CommandSender;
import org.bukkit.permissions.Permission;
@ -44,12 +45,11 @@ public class TelnetListener extends Handler implements CommandSender {
MCTelnet parent;
String ip;
String passRegex = "[^a-zA-Z0-9\\-\\.\\_]";
String commandRegex = "[^a-zA-Z0-9 \\-\\.\\_]";
String commandRegex = "[^a-zA-Z0-9 \\-\\.\\_\\\"]";
public TelnetListener(Socket inSock, MinecraftServer imcserv, MCTelnet iparent)
public TelnetListener(Socket inSock, MCTelnet iparent)
{
run = true;
mcserv = imcserv;
clientSocket = inSock;
parent = iparent;
passRegex = parent.getConfiguration().getString("passwordRegex",passRegex);
@ -294,7 +294,7 @@ public class TelnetListener extends Handler implements CommandSender {
try {
if(!clientSocket.isClosed())
{
outstream.write(record.getMessage()+"\r\n:");
outstream.write(ChatColor.stripColor(record.getMessage())+"\r\n:");
outstream.flush();
}
} catch (IOException ex) {
@ -317,6 +317,7 @@ public class TelnetListener extends Handler implements CommandSender {
if(clientSocket.isConnected())
{
try {
string = ChatColor.stripColor(string);
outstream.write(string + "\r\n:");
outstream.flush();
} catch (IOException ex) {

View file

@ -1,6 +1,6 @@
name: MCTelnet
main: com.bekvon.bukkit.mctelnet.MCTelnet
version: 1.2.6
version: 1.2.7
description: Telnet console access plugin.
author: bekvon
commands: