Core/ChatCommands: Honor exact matches during enum arg parsing (PR #25255)

1 files changed, 7 insertions, 4 deletions

diff --git a/src/server/game/Chat/ChatCommands/ChatCommandArgs.h b/src/server/game/Chat/ChatCommands/ChatCommandArgs.h
index d54c684f581..242b806446d 100644
--- a/src/server/game/Chat/ChatCommands/ChatCommandArgs.h
+++ b/src/server/game/Chat/ChatCommands/ChatCommandArgs.h
@@ -142,10 +142,13 @@ struct ArgInfo<T, std::enable_if_t<std::is_enum_v<T>>>
         if (it == SearchMap.end() || !StringStartsWith(it->first, s)) // not a match
             return nullptr;
 
-        auto it2 = it;
-        ++it2;
-        if (it2 != SearchMap.end() && StringStartsWith(it2->first, s)) // not unique
-            return nullptr;
+        if (it->first != s) // we don't have an exact match - check if it is unique
+        {
+            auto it2 = it;
+            ++it2;
+            if (it2 != SearchMap.end() && StringStartsWith(it2->first, s)) // not unique
+                return nullptr;
+        }
 
         if (it->second)
             return &*it->second;