minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-13 10:04:51 +02:00
Code Issues Releases Wiki Activity

Stripping vanilla colours from /msg

Browse Source
This commit is contained in:
KHobbits
2012-01-16 19:42:15 +00:00
parent 26d63f3666
commit 4435121c84
2 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
Essentials/src/com/earth2me/essentials/commands/Commandmsg.java
View File

@@ -4,6 +4,7 @@ import com.earth2me.essentials.Console;
import static com.earth2me.essentials.I18n._; import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.IReplyTo; import com.earth2me.essentials.IReplyTo;
import com.earth2me.essentials.User; import com.earth2me.essentials.User;
import com.earth2me.essentials.Util;
import java.util.List; import java.util.List;
import org.bukkit.Server; import org.bukkit.Server;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
@@ -34,11 +35,11 @@ public class Commandmsg extends EssentialsCommand
} }
} }
String message = getFinalArg(args, 1); final String message = Util.stripColor(getFinalArg(args, 1));
String translatedMe = _("me"); final String translatedMe = _("me");
IReplyTo replyTo = sender instanceof Player ? ess.getUser((Player)sender) : Console.getConsoleReplyTo(); final IReplyTo replyTo = sender instanceof Player ? ess.getUser((Player)sender) : Console.getConsoleReplyTo();
String senderName = sender instanceof Player ? ((Player)sender).getDisplayName() : Console.NAME; final String senderName = sender instanceof Player ? ((Player)sender).getDisplayName() : Console.NAME;
if (args[0].equalsIgnoreCase(Console.NAME)) if (args[0].equalsIgnoreCase(Console.NAME))
{ {
@@ -50,38 +51,38 @@ public class Commandmsg extends EssentialsCommand
return; return;
} }
List<Player> matches = server.matchPlayer(args[0]); final List<Player> matchedPlayers = server.matchPlayer(args[0]);
if (matches.isEmpty()) if (matchedPlayers.isEmpty())
{ {
throw new Exception(_("playerNotFound")); throw new Exception(_("playerNotFound"));
} }
int i = 0; int i = 0;
for (Player p : matches) for (Player matchedPlayer : matchedPlayers)
{ {
final User u = ess.getUser(p); final User u = ess.getUser(matchedPlayer);
if (u.isHidden()) if (u.isHidden())
{ {
i++; i++;
} }
} }
if (i == matches.size()) if (i == matchedPlayers.size())
{ {
throw new Exception(_("playerNotFound")); throw new Exception(_("playerNotFound"));
} }
for (Player p : matches) for (Player matchedPlayer : matchedPlayers)
{ {
sender.sendMessage(_("msgFormat", translatedMe, p.getDisplayName(), message)); sender.sendMessage(_("msgFormat", translatedMe, matchedPlayer.getDisplayName(), message));
final User u = ess.getUser(p); final User matchedUser = ess.getUser(matchedPlayer);
if (sender instanceof Player && (u.isIgnoredPlayer(((Player)sender).getName()) || u.isHidden())) if (sender instanceof Player && (matchedUser.isIgnoredPlayer(((Player)sender).getName()) || matchedUser.isHidden()))
{ {
continue; continue;
} }
p.sendMessage(_("msgFormat", senderName, translatedMe, message)); matchedPlayer.sendMessage(_("msgFormat", senderName, translatedMe, message));
replyTo.setReplyTo(ess.getUser(p)); replyTo.setReplyTo(ess.getUser(matchedPlayer));
ess.getUser(p).setReplyTo(sender); ess.getUser(matchedPlayer).setReplyTo(sender);
} }
} }
} }

11
EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java
View File

@@ -112,7 +112,7 @@ public abstract class EssentialsChatPlayer extends PlayerListener
logger.info(_("localFormat", sender.getName(), event.getMessage())); logger.info(_("localFormat", sender.getName(), event.getMessage()));
final Location loc = sender.getLocation(); final Location loc = sender.getLocation();
final World world = loc.getWorld(); final World world = loc.getWorld();
for (Player onlinePlayer : server.getOnlinePlayers()) for (Player onlinePlayer : server.getOnlinePlayers())
{ {
String type = "[L]"; String type = "[L]";
@@ -123,11 +123,14 @@ public abstract class EssentialsChatPlayer extends PlayerListener
continue; continue;
} }
if (!user.equals(sender)) if (!user.equals(sender))
{ {
final Location playerLoc = user.getLocation(); final Location playerLoc = user.getLocation();
if (playerLoc.getWorld() != world) { continue; } if (playerLoc.getWorld() != world)
{
continue;
}
final double delta = playerLoc.distanceSquared(loc); final double delta = playerLoc.distanceSquared(loc);
if (delta > radius) if (delta > radius)
{ {
if (user.isAuthorized("essentials.chat.spy")) if (user.isAuthorized("essentials.chat.spy"))