aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sql/updates/world/2014_10_29_01_world.sql7
-rw-r--r--src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp15
2 files changed, 14 insertions, 8 deletions
diff --git a/sql/updates/world/2014_10_29_01_world.sql b/sql/updates/world/2014_10_29_01_world.sql
new file mode 100644
index 00000000000..f29b6745133
--- /dev/null
+++ b/sql/updates/world/2014_10_29_01_world.sql
@@ -0,0 +1,7 @@
+-- Spell difficulty entry for Slag Pot Damage spell
+DELETE FROM `spelldifficulty_dbc` WHERE `id` = 65722;
+INSERT INTO `spelldifficulty_dbc` (`id`, `spellid0`, `spellid1`, `spellid2`, `spellid3`) VALUES
+(65722, 65722, 65723, 0, 0);
+
+-- Clean up unneeded criteria data, enables achievement Hot Pocket
+DELETE FROM `achievement_criteria_data` WHERE `criteria_id` IN (10430, 10431) AND `type` = 18;
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*/)