From e5e970baec14513d275a0da8c5db930a59524c4b Mon Sep 17 00:00:00 2001 From: zwerg Date: Sat, 9 Feb 2013 23:17:29 +0100 Subject: Core/Spells: Fix cooldown problems for Val'anyr, Hammer of Ancient Kings Closes #9162 --- src/server/scripts/Spells/spell_item.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/server/scripts') diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp index b8e17f4ecca..d57ed6e126b 100644 --- a/src/server/scripts/Spells/spell_item.cpp +++ b/src/server/scripts/Spells/spell_item.cpp @@ -140,7 +140,7 @@ class spell_item_blessing_of_ancient_kings : public SpellScriptLoader protEff->SetAmount(std::min(protEff->GetAmount() + absorb, 20000)); // Refresh and return to prevent replacing the aura - aurEff->GetBase()->RefreshDuration(); + protEff->GetBase()->RefreshDuration(); } else GetTarget()->CastCustomSpell(SPELL_PROTECTION_OF_ANCIENT_KINGS, SPELLVALUE_BASE_POINT0, absorb, eventInfo.GetProcTarget(), true, NULL, aurEff); -- cgit v1.2.3 From 20cd6cfc61414c47a6ed784e62f967ca6b44960e Mon Sep 17 00:00:00 2001 From: Shauren Date: Tue, 12 Feb 2013 12:39:48 +0100 Subject: Scripts/Icecrown Citadel: Fixed possible crash for Necrotic Plague (if cast outside of ICC) Closes #9188 --- src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/server/scripts') diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp index fb1415aa60b..b040ff17c38 100644 --- a/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp +++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp @@ -2178,7 +2178,8 @@ class spell_the_lich_king_necrotic_plague_jump : public SpellScriptLoader void OnApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { if (Unit* caster = GetCaster()) - caster->GetAI()->SetData(DATA_PLAGUE_STACK, GetStackAmount()); + if (caster->GetAI()) + caster->GetAI()->SetData(DATA_PLAGUE_STACK, GetStackAmount()); } void OnRemove(AuraEffect const* aurEff, AuraEffectHandleModes /*mode*/) -- cgit v1.2.3