From 374ae0100f75a7facb3f4d4b02d593be406c373a Mon Sep 17 00:00:00 2001
From: STG-Allen <ajacob715@gmail.com>
Date: Fri, 2 Apr 2021 11:03:13 -0400
Subject: [PATCH] Fix an issue with StaffChat from console, properly detect
 wildcard in command logging

---
 .../catalyst/common/listener/CommonCommandListener.java      | 2 +-
 .../catalyst/common/listener/CommonStaffChatListener.java    | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/catalyst-common/src/main/java/org/anvilpowered/catalyst/common/listener/CommonCommandListener.java b/catalyst-common/src/main/java/org/anvilpowered/catalyst/common/listener/CommonCommandListener.java
index 8a168c86..812388e5 100644
--- a/catalyst-common/src/main/java/org/anvilpowered/catalyst/common/listener/CommonCommandListener.java
+++ b/catalyst-common/src/main/java/org/anvilpowered/catalyst/common/listener/CommonCommandListener.java
@@ -39,7 +39,7 @@ public class CommonCommandListener implements CommandListener {
     public void onCommandExecution(CommandEvent event) {
         if (registry.getOrDefault(CatalystKeys.COMMAND_LOGGING_ENABLED)) {
             List<String> commandList = registry.getOrDefault(CatalystKeys.COMMAND_LOGGING_FILTER);
-            if ((commandList.size() == 1 && commandList.get(0).equals("*"))
+            if (commandList.contains("*")
                 || commandList.contains(event.getCommand())) {
                 logger.info(event.getSourceName() + " executed command : " + event.getCommand());
             }
diff --git a/catalyst-common/src/main/java/org/anvilpowered/catalyst/common/listener/CommonStaffChatListener.java b/catalyst-common/src/main/java/org/anvilpowered/catalyst/common/listener/CommonStaffChatListener.java
index 6042eb98..24d50a04 100644
--- a/catalyst-common/src/main/java/org/anvilpowered/catalyst/common/listener/CommonStaffChatListener.java
+++ b/catalyst-common/src/main/java/org/anvilpowered/catalyst/common/listener/CommonStaffChatListener.java
@@ -60,8 +60,6 @@ public class CommonStaffChatListener<
     @Override
     public void onStaffChatEvent(StaffChatEvent<TString, TPlayer> event) {
         String message = event.getRawMessage();
-        TUser player = (TUser) event.getPlayer();
-        String userName = userService.getUserName(player);
 
         if (event.getIsConsole()) {
             String finalMessage = message;
@@ -77,6 +75,9 @@ public void onStaffChatEvent(StaffChatEvent<TString, TPlayer> event) {
             return;
         }
 
+        TUser player = (TUser) event.getPlayer();
+        String userName = userService.getUserName(player);
+
         if (registry.getOrDefault(CatalystKeys.EMOJI_ENABLE)
             && permissionService.hasPermission(player,
             registry.getOrDefault(CatalystKeys.EMOJI_PERMISSION))) {