diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp index c453217a77..6a149d97b3 100644 --- a/src/game/Creature.cpp +++ b/src/game/Creature.cpp @@ -1750,7 +1750,7 @@ void Creature::setDeathState(DeathState s) SetMeleeDamageSchool(SpellSchools(cinfo->dmgschool)); LoadCreaturesAddon(true); Motion_Initialize(); - if(GetPhaseMask() != GetCreatureData()->phaseMask) + if(GetCreatureData() && GetPhaseMask() != GetCreatureData()->phaseMask) SetPhaseMask(GetCreatureData()->phaseMask, true); } }