Merge branch 'master' into Playerbot

2025-01-23 23:23:53 +08:00
parent 91edb92f7a 365224039f
commit cf035b5e5e
77 changed files with 1682 additions and 1680 deletions
@@ -8688,7 +8688,7 @@ bool ObjectMgr::LoadModuleStringsLocale()
 std::string const* ObjectMgr::GetModuleString(std::string module, uint32 id, LocaleConstant locale) const
 {
    ModuleString const* ms = GetModuleString(module, id);
-    if (ms->Content.size())
+    if (ms && !ms->Content.empty())
    {
        if (ms->Content.size() > size_t(locale) && !ms->Content[locale].empty())
            return &ms->Content[locale];