Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-30 21:57:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:TrinityCore/TrinityCore

Browse Source
This commit is contained in:
Shauren
2011-10-06 14:22:38 +02:00
parent 8919b9cb4c 2f5e10c1ba
commit 4c441af07b
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/server/game/Spells/Auras/SpellAuras.cpp
View File

@@ -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:

3
src/server/scripts/Northrend/VioletHold/boss_cyanigosa.cpp
View File

@@ -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;