Upstream
/
Essentials
mirror of https://github.com/EssentialsX/Essentials.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Don't socialspy broadcast raw /msg and /r.

This commit is contained in:
Ali Moghnieh 2016-07-23 00:09:18 +01:00
parent 87adbb477d
commit c4c303dbfb
No known key found for this signature in database
GPG Key ID: F09D3A1BAF2E6D70
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
View File

@ -384,12 +384,18 @@ public class EssentialsPlayerListener implements Listener {
LOGGER.info(tl("mutedUserSpeaks", player.getName()));
return;
}
PluginCommand pluginCommand = ess.getServer().getPluginCommand(cmd);
if (ess.getSettings().getSocialSpyCommands().contains(cmd) || ess.getSettings().getSocialSpyCommands().contains("*")) {
User user = ess.getUser(player);
if (!user.isAuthorized("essentials.chat.spy.exempt")) {
for (User spyer : ess.getOnlineUsers()) {
if (spyer.isSocialSpyEnabled() && !player.equals(spyer.getBase())) {
spyer.sendMessage(player.getDisplayName() + " : " + event.getMessage());
if (pluginCommand == null
|| (!pluginCommand.getName().equals("msg") && !pluginCommand.getName().equals("r"))) { // /msg and /r are handled in SimpleMessageRecipient
User user = ess.getUser(player);
if (!user.isAuthorized("essentials.chat.spy.exempt")) {
for (User spyer : ess.getOnlineUsers()) {
if (spyer.isSocialSpyEnabled() && !player.equals(spyer.getBase())) {
spyer.sendMessage(player.getDisplayName() + " : " + event.getMessage());
}
}
}
}
@ -398,7 +404,6 @@ public class EssentialsPlayerListener implements Listener {
boolean broadcast = true; // whether to broadcast the updated activity
boolean update = true; // Only modified when the command is afk
PluginCommand pluginCommand = ess.getServer().getPluginCommand(cmd);
if (pluginCommand != null) {
// Switch case for commands that shouldn't broadcast afk activity.
switch (pluginCommand.getName()) {