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

[11862] Do not overwrite channel spells with other channel spells. Close pull request #28

Browse source 
Signed-off-by: Schmoozerd <schmoozerd@scriptdev2.com>
This commit is contained in:
Reamer 2011-12-12 16:57:57 +01:00 • committed by Schmoozerd
parent e0d6952ad1
commit 396ce3b71d
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/game/Spell.cpp
View file

@ -4122,6 +4122,10 @@ void Spell::SendChannelUpdate(uint32 time)
if (Unit* target = ObjectAccessor::GetUnit(*m_caster, target_guid)) if (Unit* target = ObjectAccessor::GetUnit(*m_caster, target_guid))
target->RemoveAurasByCasterSpell(m_spellInfo->Id, m_caster->GetObjectGuid()); target->RemoveAurasByCasterSpell(m_spellInfo->Id, m_caster->GetObjectGuid());
// Only finish channeling when latest channeled spell finishes
if (m_caster->GetUInt32Value(UNIT_CHANNEL_SPELL) != m_spellInfo->Id)
return;
m_caster->SetChannelObjectGuid(ObjectGuid()); m_caster->SetChannelObjectGuid(ObjectGuid());
m_caster->SetUInt32Value(UNIT_CHANNEL_SPELL, 0); m_caster->SetUInt32Value(UNIT_CHANNEL_SPELL, 0);
} }

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 "11861" #define REVISION_NR "11862"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__