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

[10189] Fix display of Interrupted message and fix channelled spells interrupting

Browse source
This commit is contained in:
Laise 2010-07-14 13:22:32 +03:00
parent eadeda8f5d
commit 904ef55b4e
4 changed files with 20 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/game/Unit.cpp
View file

@ -4518,10 +4518,10 @@ void Unit::RemoveSpellAuraHolder(SpellAuraHolder *holder, AuraRemoveMode mode)
// Statue unsummoned at holder remove
SpellEntry const* AurSpellInfo = holder->GetSpellProto();
Totem* statue = NULL;
if(IsChanneledSpell(AurSpellInfo))
if(Unit* caster = holder->GetCaster())
if(caster->GetTypeId()==TYPEID_UNIT && ((Creature*)caster)->isTotem() && ((Totem*)caster)->GetTotemType()==TOTEM_STATUE)
statue = ((Totem*)caster);
Unit* caster = holder->GetCaster();
if(IsChanneledSpell(AurSpellInfo) && caster)
if(caster->GetTypeId()==TYPEID_UNIT && ((Creature*)caster)->isTotem() && ((Totem*)caster)->GetTotemType()==TOTEM_STATUE)
statue = ((Totem*)caster);
if (m_spellAuraHoldersUpdateIterator != m_spellAuraHolders.end() && m_spellAuraHoldersUpdateIterator->second == holder)
++m_spellAuraHoldersUpdateIterator;
@ -4559,6 +4559,9 @@ void Unit::RemoveSpellAuraHolder(SpellAuraHolder *holder, AuraRemoveMode mode)
m_deletedHolders.push_back(holder);
else
delete holder;
if (IsChanneledSpell(AurSpellInfo) && caster && caster->GetGUID() != GetGUID())
caster->InterruptSpell(CURRENT_CHANNELED_SPELL);
}
void Unit::RemoveSingleAuraFromSpellAuraHolder(SpellAuraHolder *holder, SpellEffectIndex index, AuraRemoveMode mode)