aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNyeriah <sarah.trysan@live.com>2014-10-29 21:58:16 -0200
committerNyeriah <sarah.trysan@live.com>2014-10-29 21:58:16 -0200
commit848c10e581a45e962045827092e1bd68ef2c52f0 (patch)
treebec8596ff60db0ad812bed9c640e5650af8bd593 /src
parent34ba35b8c7fa631d0653628f9f35b9d7a26f966f (diff)
Scripts/Ulduar: Fix Ignis' Slag Pot periodic ticks and enable achievement "Hot Pocket"
(cherry picked from commit 21820b425b0b573229f683a2d45b23d8a42c888d)
Diffstat (limited to 'src')
-rw-r--r--src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp15
1 files changed, 7 insertions, 8 deletions
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp
index 14087ace975..276e3a10513 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp
@@ -241,7 +241,7 @@ class boss_ignis : public CreatureScript
case EVENT_CHANGE_POT:
if (Unit* slagPotTarget = ObjectAccessor::GetUnit(*me, _slagPotGUID))
{
- slagPotTarget->AddAura(SPELL_SLAG_POT, slagPotTarget);
+ DoCast(slagPotTarget, SPELL_SLAG_POT, true);
slagPotTarget->EnterVehicle(me, 1);
events.CancelEvent(EVENT_CHANGE_POT);
events.ScheduleEvent(EVENT_END_POT, 10000);
@@ -458,14 +458,13 @@ class spell_ignis_slag_pot : public SpellScriptLoader
return true;
}
- void HandleEffectPeriodic(AuraEffect const* aurEff)
+ void HandleEffectPeriodic(AuraEffect const* /*aurEff*/)
{
- Unit* aurEffCaster = aurEff->GetCaster();
- if (!aurEffCaster)
- return;
-
- Unit* target = GetTarget();
- aurEffCaster->CastSpell(target, SPELL_SLAG_POT_DAMAGE, true);
+ if (Unit* caster = GetCaster())
+ {
+ Unit* target = GetTarget();
+ caster->CastSpell(target, SPELL_SLAG_POT_DAMAGE, true);
+ }
}
void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)