diff options
| author | QAston <qaston@gmail.com> | 2011-08-24 10:02:26 -0700 |
|---|---|---|
| committer | QAston <qaston@gmail.com> | 2011-08-24 10:02:26 -0700 |
| commit | b69330676d148b9cefaf2bbfb2109921a53c2c93 (patch) | |
| tree | 12a3ba395cee7981653388d032e6767429d96c39 /src | |
| parent | 7a3b1f1ed51d6d310e42ddfc517c76a17f2bd073 (diff) | |
| parent | c0326e317054e0f58a2e137359caa95d2d52adcb (diff) | |
Merge pull request #2588 from hacknowledge/fix_2488
Crashfix. Added missing check for NULL of victim parameter
Diffstat (limited to 'src')
| -rwxr-xr-x | src/server/game/Entities/Unit/Unit.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index eb789fde038..c8b1abc1deb 100755 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -620,7 +620,7 @@ bool Unit::HasAuraTypeWithFamilyFlags(AuraType auraType, uint32 familyName, uint void Unit::DealDamageMods(Unit* victim, uint32 &damage, uint32* absorb) { - if (!victim->isAlive() || victim->HasUnitState(UNIT_STAT_IN_FLIGHT) || (victim->GetTypeId() == TYPEID_UNIT && victim->ToCreature()->IsInEvadeMode())) + if (!victim || !victim->isAlive() || victim->HasUnitState(UNIT_STAT_IN_FLIGHT) || (victim->GetTypeId() == TYPEID_UNIT && victim->ToCreature()->IsInEvadeMode())) { if (absorb) *absorb += damage; |