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

[10844] Remove small redundency in magnet spell charges checks.

Browse source
This commit is contained in:
VladimirMangos 2010-12-09 06:45:49 +03:00
parent 4686f905ac
commit 00db6dbf28
2 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/game/Unit.cpp
View file

@ -6079,9 +6079,8 @@ Unit* Unit::SelectMagnetTarget(Unit *victim, Spell* spell, SpellEffectIndex eff)
if (magnet->isAlive() && magnet->IsWithinLOSInMap(this) && spell->CheckTarget(magnet, eff)) if (magnet->isAlive() && magnet->IsWithinLOSInMap(this) && spell->CheckTarget(magnet, eff))
{ {
if (SpellAuraHolder *holder = (*itr)->GetHolder()) if (SpellAuraHolder *holder = (*itr)->GetHolder())
if (holder->GetAuraCharges()) if (holder->DropAuraCharge())
if (holder->DropAuraCharge()) victim->RemoveSpellAuraHolder(holder);
victim->RemoveSpellAuraHolder(holder);
return magnet; return magnet;
} }
} }
@ -6100,9 +6099,8 @@ Unit* Unit::SelectMagnetTarget(Unit *victim, Spell* spell, SpellEffectIndex eff)
if (roll_chance_i((*i)->GetModifier()->m_amount)) if (roll_chance_i((*i)->GetModifier()->m_amount))
{ {
if (SpellAuraHolder *holder = (*i)->GetHolder()) if (SpellAuraHolder *holder = (*i)->GetHolder())
if (holder->GetAuraCharges()) if (holder->DropAuraCharge())
if (holder->DropAuraCharge()) victim->RemoveSpellAuraHolder(holder);
victim->RemoveSpellAuraHolder(holder);
return magnet; return magnet;
} }
} }

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 "10843" #define REVISION_NR "10844"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__