From 832062589b02c80f2d6fd9b64023a9a54060ae39 Mon Sep 17 00:00:00 2001 From: DemiDroL Date: Sun, 2 Oct 2011 22:53:57 +1000 Subject: Crashfix: GetInstanceScript() if target is NULL in achievement_defenseless --- src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src') diff --git a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp index 1e17103d23d..7ba12847750 100644 --- a/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp +++ b/src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp @@ -168,6 +168,9 @@ class achievement_defenseless : public AchievementCriteriaScript bool OnCheck(Player* /*player*/, Unit* target) { + if(!target) + return false; + InstanceScript* instance = target->GetInstanceScript(); if (!instance) return false; -- cgit v1.2.3 From ae63e8b4f6b175815da4ae2c18f2854b74c3087f Mon Sep 17 00:00:00 2001 From: "idostyle@zoit" Date: Mon, 5 Sep 2011 16:40:54 +0200 Subject: Core/Spell: Shattered Barrier should obey proc chance of talent ranks --- src/server/game/Spells/Auras/SpellAuras.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp index e2690c02b1d..df6ac44f2cc 100755 --- a/src/server/game/Spells/Auras/SpellAuras.cpp +++ b/src/server/game/Spells/Auras/SpellAuras.cpp @@ -1347,8 +1347,9 @@ void Aura::HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, b if (removeMode == AURA_REMOVE_BY_ENEMY_SPELL && GetSpellInfo()->SpellFamilyFlags[1] & 0x1) { // Shattered Barrier - if (caster->GetDummyAuraEffect(SPELLFAMILY_MAGE, 2945, 0)) - caster->CastSpell(target, 55080, true, NULL, GetEffect(0)); + if (AuraEffect * dummy = caster->GetDummyAuraEffect(SPELLFAMILY_MAGE, 2945, 0)) + if (roll_chance_i(dummy->GetSpellInfo()->ProcChance)) + caster->CastSpell(target, 55080, true, NULL, GetEffect(0)); } break; case SPELLFAMILY_WARRIOR: -- cgit v1.2.3