Merge branch master into boost
Conflicts:
BattlegroundMgr.h
This commit is contained in:
1 parent
f14399d788
commit
dfdc19f3bc
84 files changed
+2009
-890
No files matched your search
@@ -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;
|
||||
@@ -1227,7 +1230,7 @@ void Spell::EffectUnlearnSpecialization(SpellEffIndex effIndex)
|
||||
Player* player = unitTarget->ToPlayer();
|
||||
uint32 spellToUnlearn = m_spellInfo->Effects[effIndex].TriggerSpell;
|
||||
|
||||
player->removeSpell(spellToUnlearn);
|
||||
player->RemoveSpell(spellToUnlearn);
|
||||
|
||||
TC_LOG_DEBUG("spells", "Spell: Player %u has unlearned spell %u from NpcGUID: %u", player->GetGUIDLow(), spellToUnlearn, m_caster->GetGUIDLow());
|
||||
}
|
||||
@@ -2370,7 +2373,7 @@ void Spell::EffectLearnSpell(SpellEffIndex effIndex)
|
||||
Player* player = unitTarget->ToPlayer();
|
||||
|
||||
uint32 spellToLearn = (m_spellInfo->Id == 483 || m_spellInfo->Id == 55884) ? damage : m_spellInfo->Effects[effIndex].TriggerSpell;
|
||||
player->learnSpell(spellToLearn, false);
|
||||
player->LearnSpell(spellToLearn, false);
|
||||
|
||||
TC_LOG_DEBUG("spells", "Spell: Player %u has learned spell %u from NpcGUID=%u", player->GetGUIDLow(), spellToLearn, m_caster->GetGUIDLow());
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user