Merge branch 'master' into 4.3.4
Conflicts: src/server/game/AI/EventAI/CreatureEventAI.cpp src/server/game/Entities/Object/ObjectDefines.h src/server/scripts/EasternKingdoms/CMakeLists.txt src/server/scripts/Kalimdor/CMakeLists.txt
This commit is contained in:
commit
d35d33aa86
93 files changed
+1466
-190
No files matched your search
@@ -823,10 +823,10 @@ void Spell::SelectEffectImplicitTargets(SpellEffIndex effIndex, SpellImplicitTar
|
||||
for (uint32 j = effIndex + 1; j < MAX_SPELL_EFFECTS; ++j)
|
||||
{
|
||||
SpellEffectInfo const* effects = GetSpellInfo()->Effects;
|
||||
if (effects[effIndex].TargetA.GetTarget() == effects[j].TargetA.GetTarget()
|
||||
&& effects[effIndex].TargetB.GetTarget() == effects[j].TargetB.GetTarget()
|
||||
&& effects[effIndex].ImplicitTargetConditions == effects[j].ImplicitTargetConditions
|
||||
&& effects[effIndex].CalcRadius(m_caster) == effects[j].CalcRadius(m_caster))
|
||||
if (effects[effIndex].TargetA.GetTarget() == effects[j].TargetA.GetTarget() &&
|
||||
effects[effIndex].TargetB.GetTarget() == effects[j].TargetB.GetTarget() &&
|
||||
effects[effIndex].ImplicitTargetConditions == effects[j].ImplicitTargetConditions &&
|
||||
effects[effIndex].CalcRadius(m_caster) == effects[j].CalcRadius(m_caster))
|
||||
{
|
||||
effectMask |= 1 << j;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user