Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts: src/server/game/AI/CoreAI/TotemAI.cpp src/server/game/Entities/Unit/Unit.cpp src/server/game/Globals/ObjectMgr.cpp src/server/game/Handlers/ItemHandler.cpp src/server/game/Spells/Spell.cpp src/server/game/Spells/SpellEffects.cpp src/server/scripts/Spells/spell_shaman.cpp src/server/scripts/Spells/spell_warlock.cpp
This commit is contained in:
commit
aca68428c2
27 files changed
+241
-264
No files matched your search
@@ -23326,8 +23326,8 @@ void Player::resetSpells(bool myClassOnly)
|
||||
continue;
|
||||
|
||||
// skip spells with first rank learned as talent (and all talents then also)
|
||||
uint32 first_rank = sSpellMgr->GetFirstSpellInChain(spellInfo->Id);
|
||||
if (GetTalentSpellCost(first_rank) > 0)
|
||||
uint32 firstRank = spellInfo->GetFirstRankSpell()->Id;
|
||||
if (GetTalentSpellCost(firstRank) > 0)
|
||||
continue;
|
||||
|
||||
// skip broken spells
|
||||
@@ -23397,15 +23397,14 @@ void Player::learnQuestRewardedSpells(Quest const* quest)
|
||||
uint32 learned_0 = spellInfo->Effects[0].TriggerSpell;
|
||||
if (sSpellMgr->GetSpellRank(learned_0) > 1 && !HasSpell(learned_0))
|
||||
{
|
||||
// not have first rank learned (unlearned prof?)
|
||||
uint32 first_spell = sSpellMgr->GetFirstSpellInChain(learned_0);
|
||||
if (!HasSpell(first_spell))
|
||||
return;
|
||||
|
||||
SpellInfo const* learnedInfo = sSpellMgr->GetSpellInfo(learned_0);
|
||||
if (!learnedInfo)
|
||||
return;
|
||||
|
||||
// not have first rank learned (unlearned prof?)
|
||||
if (!HasSpell(learnedInfo->GetFirstRankSpell()->Id))
|
||||
return;
|
||||
|
||||
SpellsRequiringSpellMapBounds spellsRequired = sSpellMgr->GetSpellsRequiredForSpellBounds(learned_0);
|
||||
for (SpellsRequiringSpellMap::const_iterator itr2 = spellsRequired.first; itr2 != spellsRequired.second; ++itr2)
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user