diff options
author | Nayd <dnpd.dd@gmail.com> | 2014-11-16 01:20:12 +0000 |
---|---|---|
committer | Nayd <dnpd.dd@gmail.com> | 2014-11-16 01:20:12 +0000 |
commit | b94e1cdc1d9e961946faff65d0bf1a399c416097 (patch) | |
tree | 8b4c5d42f96802e69141f25f10b0013cd816691c /src | |
parent | d87504dee5cf3bd13fd8bb30d2937390cf7dfc1b (diff) |
Core/Loading: Fix crash in LoadMissingKeyChains
Also emptied `world`.`keychain_db2`
Closes #13566
Diffstat (limited to 'src')
-rw-r--r-- | src/server/game/Globals/ObjectMgr.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 755b6a2ac59..90a40aa7990 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -9014,6 +9014,12 @@ void ObjectMgr::LoadMissingKeyChains() uint32 id = fields[0].GetUInt32(); KeyChainEntry* kce = sKeyChainStore.CreateEntry(id, true); + if (!kce) + { + TC_LOG_ERROR("sql.sql", "Could not create KeyChainEntry %u, skipped.", id); + continue; + } + kce->Id = id; for (uint32 i = 0; i < KEYCHAIN_SIZE; ++i) kce->Key[i] = fields[1 + i].GetUInt8(); |