Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-21 01:37:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10887 from zorix/PR3

Browse Source 
Core/Spell:  Triggered spells now will be cast on the primal target instead of on caster

Closes #10853
Closes #10860
This commit is contained in:
Sebastian Valle Herrera
2014-07-08 09:57:37 -05:00
parent 48d284e88e e9b7bb0a7b
commit 4a4da95aa0
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/server/game/Spells/Spell.cpp
View File

@@ -1305,6 +1305,7 @@ void Spell::SelectImplicitCasterDestTargets(SpellEffIndex effIndex, SpellImplici
void Spell::SelectImplicitTargetDestTargets(SpellEffIndex effIndex, SpellImplicitTargetInfo const& targetType)
{
ASSERT(m_targets.GetObjectTarget() && "Spell::SelectImplicitTargetDestTargets - no explicit object target available!");
WorldObject* target = m_targets.GetObjectTarget();
SpellDestination dest(*target);

5
src/server/game/Spells/SpellEffects.cpp
View File

@@ -866,7 +866,10 @@ void Spell::EffectTriggerSpell(SpellEffIndex effIndex)
if (spellInfo->GetExplicitTargetMask() & TARGET_FLAG_DEST_LOCATION)
targets.SetDst(m_targets);
targets.SetUnitTarget(m_caster);
if (Unit* target = m_targets.GetUnitTarget())
targets.SetUnitTarget(target);
else
targets.SetUnitTarget(m_caster);
}
CustomSpellValues values;