Merge branch 'master' into Playerbot

src/server/game/Scripting/ScriptDefines/AllCommandScript.cpp

@@ -24,9 +24,9 @@ void ScriptMgr::OnHandleDevCommand(Player* player, bool& enable)
     CALL_ENABLED_HOOKS(AllCommandScript, ALLCOMMANDHOOK_ON_HANDLE_DEV_COMMAND, script->OnHandleDevCommand(player, enable));
 }
 
-bool ScriptMgr::CanExecuteCommand(ChatHandler& handler, std::string_view cmdStr)
+bool ScriptMgr::OnTryExecuteCommand(ChatHandler& handler, std::string_view cmdStr)
 {
-    CALL_ENABLED_BOOLEAN_HOOKS(AllCommandScript, ALLCOMMANDHOOK_CAN_EXECUTE_COMMAND, !script->CanExecuteCommand(handler, cmdStr));
+    CALL_ENABLED_BOOLEAN_HOOKS(AllCommandScript, ALLCOMMANDHOOK_ON_TRY_EXECUTE_COMMAND, !script->OnTryExecuteCommand(handler, cmdStr));
 }
 
 AllCommandScript::AllCommandScript(const char* name, std::vector<uint16> enabledHooks)

src/server/game/Scripting/ScriptDefines/AllCommandScript.h

@@ -24,7 +24,7 @@
 enum AllCommandHook
 {
     ALLCOMMANDHOOK_ON_HANDLE_DEV_COMMAND,
-    ALLCOMMANDHOOK_CAN_EXECUTE_COMMAND,
+    ALLCOMMANDHOOK_ON_TRY_EXECUTE_COMMAND,
     ALLCOMMANDHOOK_END
 };
 
@@ -39,12 +39,12 @@ public:
     virtual void OnHandleDevCommand(Player* /*player*/, bool& /*enable*/) { }
 
     /**
-     * @brief This hook runs execute chat command
+     * @brief This hook is triggered when a command is parsed, but before it is executed
      *
      * @param handler Contains information about the ChatHandler
      * @param cmdStr Contains information about the command name
      */
-    [[nodiscard]] virtual bool CanExecuteCommand(ChatHandler& /*handler*/, std::string_view /*cmdStr*/) { return true; }
+    [[nodiscard]] virtual bool OnTryExecuteCommand(ChatHandler& /*handler*/, std::string_view /*cmdStr*/) { return true; }
 };
 
 // Compatibility for old scripts

src/server/game/Scripting/ScriptMgr.h

@@ -703,7 +703,7 @@ public: /* MiscScript */
 public: /* CommandSC */
 
     void OnHandleDevCommand(Player* player, bool& enable);
-    bool CanExecuteCommand(ChatHandler& handler, std::string_view cmdStr);
+    bool OnTryExecuteCommand(ChatHandler& handler, std::string_view cmdStr);
 
 public: /* DatabaseScript */