Skip to content

Commit c7f777c

Browse files
committed
Make ignore check occur earlier
1 parent 869b446 commit c7f777c

File tree

1 file changed

+17
-16
lines changed

1 file changed

+17
-16
lines changed

Essentials/src/main/java/com/earth2me/essentials/EssentialsPlayerListener.java

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -43,22 +43,6 @@ public void onPlayerRespawn(final PlayerRespawnEvent event) {
4343
@Override
4444
public void onPlayerChat(final PlayerChatEvent event) {
4545
final User user = ess.getUser(event.getPlayer());
46-
if (user.isMuted()) {
47-
event.setCancelled(true);
48-
user.sendMessage(Util.i18n("playerMuted"));
49-
LOGGER.info(Util.format("mutedUserSpeaks", user.getName()));
50-
}
51-
final Iterator<Player> it = event.getRecipients().iterator();
52-
while (it.hasNext()) {
53-
final User u = ess.getUser(it.next());
54-
if (u.isIgnoredPlayer(user.getName())) {
55-
it.remove();
56-
}
57-
}
58-
user.updateActivity(true);
59-
if (ess.getSettings().changeDisplayName()) {
60-
user.setDisplayName(user.getNick());
61-
}
6246

6347
// If the user has ignore exempt permission, unignore them for all players
6448
if (user.hasPermission("essentials.ignore.exempt") || user.isOp()) {
@@ -76,6 +60,23 @@ public void onPlayerChat(final PlayerChatEvent event) {
7660
}
7761
}
7862
}
63+
64+
if (user.isMuted()) {
65+
event.setCancelled(true);
66+
user.sendMessage(Util.i18n("playerMuted"));
67+
LOGGER.info(Util.format("mutedUserSpeaks", user.getName()));
68+
}
69+
final Iterator<Player> it = event.getRecipients().iterator();
70+
while (it.hasNext()) {
71+
final User u = ess.getUser(it.next());
72+
if (u.isIgnoredPlayer(user.getName())) {
73+
it.remove();
74+
}
75+
}
76+
user.updateActivity(true);
77+
if (ess.getSettings().changeDisplayName()) {
78+
user.setDisplayName(user.getNick());
79+
}
7980
}
8081

8182
@Override

0 commit comments

Comments
 (0)