mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-15 19:37:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[9459] Make spell 47540 and ranks channeling interruptible

Browse source 
In fact make triggered spell replace main spell for channeling.
This also let drop hack for target death case interrupt channeling for spell.

Signed-off-by: VladimirMangos <vladimir@getmangos.com>
This commit is contained in:
MrLama 2010-02-26 22:34:57 +03:00 • committed by VladimirMangos
parent 09b4acc53e
commit b57f4a179b
3 changed files with 7 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/game/SpellAuras.cpp
View file

@ -2511,14 +2511,6 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
caster->InterruptSpell(CURRENT_CHANNELED_SPELL); caster->InterruptSpell(CURRENT_CHANNELED_SPELL);
return; return;
} }
// Stop caster Penance chanelling on death
if (m_spellProto->SpellFamilyName == SPELLFAMILY_PRIEST &&
(m_spellProto->SpellFamilyFlags2 & UI64LIT(0x00000080)))
{
if (Unit* caster = GetCaster())
caster->InterruptSpell(CURRENT_CHANNELED_SPELL);
return;
}
} }
} }

8
src/game/SpellEffects.cpp
View file

@ -1756,10 +1756,14 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx)
return; return;
} }
// prevent interrupted message for main spell
finish(true);
// replace cast by selected spell, this also make it interruptible including target death case
if (m_caster->IsFriendlyTo(unitTarget)) if (m_caster->IsFriendlyTo(unitTarget))
m_caster->CastSpell(unitTarget, heal, true); m_caster->CastSpell(unitTarget, heal, false);
else else
m_caster->CastSpell(unitTarget, hurt, true); m_caster->CastSpell(unitTarget, hurt, false);
return; return;
} }

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "9458" #define REVISION_NR "9459"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__