@@ -9606,7 +9606,8 @@ void Unit::ClearInCombat() // Player's state will be cleared in Player::UpdateContestedPvP if (GetTypeId() != TYPEID_PLAYER) { - if (((Creature*)this)->GetCreatureInfo()->unit_flags & UNIT_FLAG_OOC_NOT_ATTACKABLE) + Creature* creature = (Creature*)this; + if (creature->GetCreatureInfo() && creature->GetCreatureInfo()->unit_flags & UNIT_FLAG_OOC_NOT_ATTACKABLE) SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE); clearUnitState(UNIT_STAT_ATTACK_PLAYER); src/game/Unit.cpp @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "8721" + #define REVISION_NR "8722" #endif // __REVISION_NR_H__ src/shared/revision_nr.h 5ad3855cba230481e1935f61281b15514cf41c36 ApoC apoc@nymfe.net http://github.com/apoc/mangos/commit/d75a45fa904323e7d263763322788f4c5ea26c9c d75a45fa904323e7d263763322788f4c5ea26c9c 2009-10-24T08:48:06-07:00 2009-10-24T05:00:40-07:00 [8722] Fixed possible creash. Crash may happen if you try summon pet by spell and certain NPC is not in your DB (than CreatureInfo* is NULL). Signed-off-by: ApoC <apoc@nymfe.net> 4f2edab3aaa4310d278eaf0c07bf3871afaa88b3 ApoC apoc@nymfe.net