diff options
| author | Shocker <shocker@freakz.ro> | 2012-01-04 13:27:43 -0800 |
|---|---|---|
| committer | Shocker <shocker@freakz.ro> | 2012-01-04 13:27:43 -0800 |
| commit | ecb1bdd7c3f85eb7721f1661af2f8f6f74e1f0b3 (patch) | |
| tree | 3fe8d1b18355c971f5bfab6f29557872fc79339f /src/server/game/Entities/Unit | |
| parent | 0a17ab2e4ce86940c6066230de1fe9939656ad3d (diff) | |
| parent | bf73409f4934754fcd8b85e70a16ceb2715e60d0 (diff) | |
Merge pull request #4489 from devilcoredev/fix_001
Core/Achievemens: Fix 'The Undying' and 'The Immortal' achievements
Diffstat (limited to 'src/server/game/Entities/Unit')
| -rwxr-xr-x | src/server/game/Entities/Unit/Unit.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 65e4bb76566..c09bedf94c4 100755 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -12764,6 +12764,10 @@ void Unit::setDeathState(DeathState s) // do not why since in IncreaseMaxHealth currenthealth is checked SetHealth(0); SetPower(getPowerType(), 0); + + // players in instance don't have ZoneScript, but they have InstanceScript + if (ZoneScript* zoneScript = GetZoneScript() ? GetZoneScript() : (ZoneScript*)GetInstanceScript()) + zoneScript->OnUnitDeath(this); } else if (s == JUST_ALIVED) RemoveFlag (UNIT_FIELD_FLAGS, UNIT_FLAG_SKINNABLE); // clear skinnable for creature and player (at battleground) |