Merge branch 'master' into Playerbot

2023-05-24 17:57:30 +08:00
parent aa1214a6ba 30f475829a
commit 72660b1ed8
131 changed files with 5656 additions and 2599 deletions
@@ -161,7 +161,7 @@ void ScriptMgr::CheckIfScriptsInDatabaseExist()
 {
    for (auto const& scriptName : sObjectMgr->GetScriptNames())
    {
-        if (uint32 sid = sObjectMgr->GetScriptId(scriptName.c_str()))
+        if (uint32 sid = sObjectMgr->GetScriptId(scriptName))
        {
            if (!ScriptRegistry<SpellScriptLoader>::GetScriptById(sid) &&
                !ScriptRegistry<ServerScript>::GetScriptById(sid) &&