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

[10569] Don't save holders from channeled spells

Browse source 
Signed-off-by: Laise <fenrisse@gmail.com>
This commit is contained in:
zergtmn 2010-10-01 12:01:57 +02:00 • committed by Laise
parent f3903d2261
commit ead698e881
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/game/Pet.cpp
View file

@ -1253,9 +1253,9 @@ void Pet::_SaveAuras()
} }
} }
//skip all holders from spells that are passive //skip all holders from spells that are passive or channeled
//do not save single target holders (unless they were cast by the player) //do not save single target holders (unless they were cast by the player)
if (save && !holder->IsPassive() && (holder->GetCasterGUID() == GetGUID() || !holder->IsSingleTarget())) if (save && !holder->IsPassive() && !IsChanneledSpell(holder->GetSpellProto()) && (holder->GetCasterGUID() == GetGUID() || !holder->IsSingleTarget()))
{ {
int32 damage[MAX_EFFECT_INDEX]; int32 damage[MAX_EFFECT_INDEX];
int32 remaintime[MAX_EFFECT_INDEX]; int32 remaintime[MAX_EFFECT_INDEX];

4
src/game/Player.cpp
View file

@ -16969,9 +16969,9 @@ void Player::_SaveAuras()
for(SpellAuraHolderMap::const_iterator itr = auraHolders.begin(); itr != auraHolders.end(); ++itr) for(SpellAuraHolderMap::const_iterator itr = auraHolders.begin(); itr != auraHolders.end(); ++itr)
{ {
SpellAuraHolder *holder = itr->second; SpellAuraHolder *holder = itr->second;
//skip all holders from spells that are passive //skip all holders from spells that are passive or channeled
//do not save single target holders (unless they were cast by the player) //do not save single target holders (unless they were cast by the player)
if (!holder->IsPassive() && (holder->GetCasterGUID() == GetGUID() || !holder->IsSingleTarget())) if (!holder->IsPassive() && !IsChanneledSpell(holder->GetSpellProto()) && (holder->GetCasterGUID() == GetGUID() || !holder->IsSingleTarget()))
{ {
int32 damage[MAX_EFFECT_INDEX]; int32 damage[MAX_EFFECT_INDEX];
int32 remaintime[MAX_EFFECT_INDEX]; int32 remaintime[MAX_EFFECT_INDEX];

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 "10568" #define REVISION_NR "10569"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__