Core/Spells: Spells having the same effect types on multiple effects will now select them at the same time (except targets selected by entry) to ensure correct behavior with MaxAffectedTargets use

1 files changed, 5 insertions, 5 deletions

diff --git a/src/server/game/Spells/Spell.h b/src/server/game/Spells/Spell.h
index b54061bc87d..e8a9a1dc95e 100755
--- a/src/server/game/Spells/Spell.h
+++ b/src/server/game/Spells/Spell.h
@@ -400,7 +400,7 @@ class Spell
 
         void InitExplicitTargets(SpellCastTargets const& targets);
         void SelectSpellTargets();
-        void SelectEffectTargets(uint32 i, SpellImplicitTargetInfo const& cur);
+        uint32 SelectEffectTargets(uint32 i, SpellImplicitTargetInfo const& cur);
         void SelectTrajTargets();
 
         template<typename T> WorldObject* FindCorpseUsing();
@@ -588,10 +588,10 @@ class Spell
         };
         std::list<ItemTargetInfo> m_UniqueItemInfo;
 
-        void AddUnitTarget(Unit* target, uint32 effIndex, bool checkIfValid = true);
-        void AddGOTarget(GameObject* target, uint32 effIndex);
-        void AddGOTarget(uint64 goGUID, uint32 effIndex);
-        void AddItemTarget(Item* target, uint32 effIndex);
+        void AddUnitTarget(Unit* target, uint32 effectMask, bool checkIfValid = true);
+        void AddGOTarget(GameObject* target, uint32 effectMask);
+        void AddGOTarget(uint64 goGUID, uint32 effectMask);
+        void AddItemTarget(Item* item, uint32 effectMask);
         void DoAllEffectOnTarget(TargetInfo* target);
         SpellMissInfo DoSpellHitOnUnit(Unit* unit, uint32 effectMask, bool scaleAura);
         void DoTriggersOnSpellHit(Unit* unit, uint8 effMask);