diff options
| -rwxr-xr-x | src/server/game/Spells/Auras/SpellAuras.cpp | 5 | ||||
| -rw-r--r-- | src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp | 3 |
2 files changed, 6 insertions, 2 deletions
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: 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; |