@@ -8735,7 +8735,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 dc6df3f5caa9022b9502281829b80a13ddbd1780 ApoC apoc@nymfe.net http://github.com/mangos/mangos/commit/560bb633e125a3ab2ad226e6c01e5c1394ec821a 560bb633e125a3ab2ad226e6c01e5c1394ec821a 2009-10-24T05:03:59-07:00 2009-10-24T05:02:41-07:00 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> (backported from commit 8dd3e4b) Signed-off-by: ApoC <apoc@nymfe.net> fecf24f5a88e851b0b8ca0f7e351c4845f02fac8 ApoC apoc@nymfe.net