Skip to content

Commit

Permalink
[10846] Add dummy aura of spell 43874 (indirectly related to spell/ef…
Browse files Browse the repository at this point in the history
…fect 50133)

Signed-off-by: NoFantasy <nofantasy@nf.no>
  • Loading branch information
NoFantasy committed Dec 9, 2010
1 parent cbae5c2 commit dd313f3
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 1 deletion.
7 changes: 7 additions & 0 deletions src/game/SpellAuras.cpp
Expand Up @@ -2018,6 +2018,10 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
case 43873: // Headless Horseman Laugh
target->PlayDistanceSound(11965);
return;
case 43874: // Scourge Mur'gul Camp: Force Shield Arcane Purple x3
target->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
target->addUnitState(UNIT_STAT_ROOT);
return;
case 46699: // Requires No Ammo
if (target->GetTypeId() == TYPEID_PLAYER)
// not use ammo and not allow use
Expand Down Expand Up @@ -2249,6 +2253,9 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
target->CastSpell(target, 36731, true, NULL, this);
return;
}
case 43874: // Scourge Mur'gul Camp: Force Shield Arcane Purple x3
target->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_OOC_NOT_ATTACKABLE);
return;
case 44191: // Flame Strike
{
if (target->GetMap()->IsDungeon())
Expand Down
2 changes: 2 additions & 0 deletions src/game/SpellEffects.cpp
Expand Up @@ -1477,12 +1477,14 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx)
if (!unitTarget || unitTarget->GetTypeId() != TYPEID_UNIT)
return;

// Scourge Mur'gul Camp: Force Shield Arcane Purple x3
if (unitTarget->HasAura(43874))
{
// someone else is already channeling target
if (unitTarget->HasAura(43878))
return;

// Scourging Crystal Controller
m_caster->CastSpell(unitTarget, 43878, true, m_CastItem);
}

Expand Down
2 changes: 1 addition & 1 deletion src/shared/revision_nr.h
@@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__
#define __REVISION_NR_H__
#define REVISION_NR "10845"
#define REVISION_NR "10846"
#endif // __REVISION_NR_H__

0 comments on commit dd313f3

Please sign in to comment.