diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp index e03151533..9fe6aca1e 100644 --- a/src/game/ObjectMgr.cpp +++ b/src/game/ObjectMgr.cpp @@ -558,7 +558,8 @@ void ObjectMgr::LoadCreatureTemplates() if(cInfo->DisplayID_A2) { - if(CreatureDisplayInfoEntry const* displayEntry = sCreatureDisplayInfoStore.LookupEntry(cInfo->DisplayID_A2)) + CreatureDisplayInfoEntry const* displayEntry = sCreatureDisplayInfoStore.LookupEntry(cInfo->DisplayID_A2); + if(!displayEntry) { sLog.outErrorDb("Creature (Entry: %u) has non-existing DisplayID_A2 id (%u), can crash client", cInfo->Entry, cInfo->DisplayID_A2); const_cast(cInfo)->DisplayID_A2 = 0; @@ -572,7 +573,8 @@ void ObjectMgr::LoadCreatureTemplates() if(cInfo->DisplayID_H2) { - if(CreatureDisplayInfoEntry const* displayEntry = sCreatureDisplayInfoStore.LookupEntry(cInfo->DisplayID_H2)) + CreatureDisplayInfoEntry const* displayEntry = sCreatureDisplayInfoStore.LookupEntry(cInfo->DisplayID_H2); + if(!displayEntry) { sLog.outErrorDb("Creature (Entry: %u) has non-existing DisplayID_H2 id (%u), can crash client", cInfo->Entry, cInfo->DisplayID_H2); const_cast(cInfo)->DisplayID_H2 = 0; diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 9d025e58d..18b858dfb 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "8000" + #define REVISION_NR "8001" #endif // __REVISION_NR_H__