Skip to content

Commit 8add9e5

Browse files
committed
Fix an issue with StaffChat from console, properly detect wildcard in command logging
1 parent 37beeb8 commit 8add9e5

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

catalyst-common/src/main/java/org/anvilpowered/catalyst/common/listener/CommonCommandListener.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public class CommonCommandListener implements CommandListener {
3939
public void onCommandExecution(CommandEvent event) {
4040
if (registry.getOrDefault(CatalystKeys.COMMAND_LOGGING_ENABLED)) {
4141
List<String> commandList = registry.getOrDefault(CatalystKeys.COMMAND_LOGGING_FILTER);
42-
if ((commandList.size() == 1 && commandList.get(0).equals("*"))
42+
if (commandList.contains("*")
4343
|| commandList.contains(event.getCommand())) {
4444
logger.info(event.getSourceName() + " executed command : " + event.getCommand());
4545
}

catalyst-common/src/main/java/org/anvilpowered/catalyst/common/listener/CommonStaffChatListener.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,6 @@ public class CommonStaffChatListener<
6060
@Override
6161
public void onStaffChatEvent(StaffChatEvent<TString, TPlayer> event) {
6262
String message = event.getRawMessage();
63-
TUser player = (TUser) event.getPlayer();
64-
String userName = userService.getUserName(player);
6563

6664
if (event.getIsConsole()) {
6765
String finalMessage = message;
@@ -77,6 +75,9 @@ public void onStaffChatEvent(StaffChatEvent<TString, TPlayer> event) {
7775
return;
7876
}
7977

78+
TUser player = (TUser) event.getPlayer();
79+
String userName = userService.getUserName(player);
80+
8081
if (registry.getOrDefault(CatalystKeys.EMOJI_ENABLE)
8182
&& permissionService.hasPermission(player,
8283
registry.getOrDefault(CatalystKeys.EMOJI_PERMISSION))) {

0 commit comments

Comments
 (0)