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

[10553] Two more cases where AURA_REMOVE_BY_EXPIRE mode can be used

Browse source 
Signed-off-by: Laise <fenrisse@gmail.com>
This commit is contained in:
zergtmn 2010-09-27 11:48:21 +02:00 • committed by Laise
parent cebc77414a
commit b0e89aa5da
2 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/game/SpellAuras.cpp
View file

@ -2278,9 +2278,7 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
// Living Bomb // Living Bomb
if (GetSpellProto()->SpellFamilyName == SPELLFAMILY_MAGE && (GetSpellProto()->SpellFamilyFlags & UI64LIT(0x2000000000000))) if (GetSpellProto()->SpellFamilyName == SPELLFAMILY_MAGE && (GetSpellProto()->SpellFamilyFlags & UI64LIT(0x2000000000000)))
{ {
// Zero duration is equal to AURA_REMOVE_BY_DEFAULT. We can't use it directly, as it is set even if (m_removeMode == AURA_REMOVE_BY_EXPIRE || m_removeMode == AURA_REMOVE_BY_DISPEL)
// when removing aura from one target due to casting Living Bomb at other.
if (m_duration == 0 || m_removeMode == AURA_REMOVE_BY_DISPEL)
target->CastSpell(target,m_modifier.m_amount,true,NULL,this); target->CastSpell(target,m_modifier.m_amount,true,NULL,this);
return; return;
@ -6256,7 +6254,7 @@ void Aura::HandleAuraRetainComboPoints(bool apply, bool Real)
// combo points was added in SPELL_EFFECT_ADD_COMBO_POINTS handler // combo points was added in SPELL_EFFECT_ADD_COMBO_POINTS handler
// remove only if aura expire by time (in case combo points amount change aura removed without combo points lost) // remove only if aura expire by time (in case combo points amount change aura removed without combo points lost)
if( !apply && m_duration==0 && target->GetComboTarget()) if( !apply && m_removeMode == AURA_REMOVE_BY_EXPIRE && target->GetComboTarget())
if(Unit* unit = ObjectAccessor::GetUnit(*GetTarget(),target->GetComboTarget())) if(Unit* unit = ObjectAccessor::GetUnit(*GetTarget(),target->GetComboTarget()))
target->AddComboPoints(unit, -m_modifier.m_amount); target->AddComboPoints(unit, -m_modifier.m_amount);
} }

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 "10552" #define REVISION_NR "10553"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__