Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps
Conflicts: src/server/game/Movement/Spline/MoveSplineInit.h
This commit is contained in:
commit
b873156c3c
52 files changed
+1886
-1018
No files matched your search
@@ -818,11 +818,16 @@ void Spell::SelectEffectImplicitTargets(SpellEffIndex effIndex, SpellImplicitTar
|
||||
return;
|
||||
// choose which targets we can select at once
|
||||
for (uint32 j = effIndex + 1; j < MAX_SPELL_EFFECTS; ++j)
|
||||
if (GetSpellInfo()->Effects[effIndex].TargetA.GetTarget() == GetSpellInfo()->Effects[j].TargetA.GetTarget() &&
|
||||
GetSpellInfo()->Effects[effIndex].TargetB.GetTarget() == GetSpellInfo()->Effects[j].TargetB.GetTarget() &&
|
||||
GetSpellInfo()->Effects[effIndex].ImplicitTargetConditions == GetSpellInfo()->Effects[j].ImplicitTargetConditions &&
|
||||
GetSpellInfo()->Effects[effIndex].CalcRadius(m_caster) == GetSpellInfo()->Effects[j].CalcRadius(m_caster))
|
||||
{
|
||||
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))
|
||||
{
|
||||
effectMask |= 1 << j;
|
||||
}
|
||||
}
|
||||
processedEffectMask |= effectMask;
|
||||
break;
|
||||
default:
|
||||
@@ -5262,7 +5267,7 @@ SpellCastResult Spell::CheckCast(bool strict)
|
||||
}
|
||||
break;
|
||||
}
|
||||
case SPELL_EFFECT_SUMMON_DEAD_PET:
|
||||
case SPELL_EFFECT_RESURRECT_PET:
|
||||
{
|
||||
Creature* pet = m_caster->GetGuardianPet();
|
||||
|
||||
|
||||
Reference in new issue
Block a user