diff options
| author | Machiavelli <machiavelli.trinity@gmail.com> | 2011-06-29 05:03:47 +0200 |
|---|---|---|
| committer | Machiavelli <machiavelli.trinity@gmail.com> | 2011-06-29 05:03:47 +0200 |
| commit | 299dd39d1f1aba39af358d6440a10fba2b387b63 (patch) | |
| tree | 539d7a009abfd2840c46ef6a44575dc06db02e31 /src | |
| parent | cbdb8d9cdcfc2fb1a51433ca9bf99224f6913986 (diff) | |
Scripts/Naxxramas: Achievement The Safetey Dance (Heigan the Unclean) shouldn't be marked as failed if non players die due to erruptions. Also tiny cleanup in affected file.
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp index 2fc5a8499c1..4fd35ab2cfc 100644 --- a/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp +++ b/src/server/scripts/Northrend/Naxxramas/boss_heigan.cpp @@ -69,13 +69,7 @@ public: if (!(rand()%5)) DoScriptText(SAY_SLAY, me); if (who->GetTypeId() == TYPEID_PLAYER) - DoAction(ACTION_SAFETY_DANCE_FAIL); - } - - void DoAction(int32 const action) - { - if (action == ACTION_SAFETY_DANCE_FAIL) - SetData(DATA_SAFETY_DANCE, 0); + safetyDance = false; } void SetData(uint32 id, uint32 data) @@ -186,13 +180,13 @@ class spell_heigan_eruption : public SpellScriptLoader void HandleScript(SpellEffIndex /*eff*/) { Unit* caster = GetCaster(); - if (!caster) + if (!caster || !GetHitPlayer()) return; - if (GetHitDamage() >= int32(GetHitUnit()->GetHealth())) + if (GetHitDamage() >= int32(GetHitPlayer()->GetHealth())) if (InstanceScript* instance = caster->GetInstanceScript()) if (Creature* Heigan = ObjectAccessor::GetCreature(*caster, instance->GetData64(DATA_HEIGAN))) - Heigan->AI()->DoAction(ACTION_SAFETY_DANCE_FAIL); + Heigan->AI()->SetData(DATA_SAFETY_DANCE, 0); } void Register() |