Core/Talents: Add check if talent hasn't been already learnt in tier

1 files changed, 11 insertions, 4 deletions

diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index ad870f0262b..127cff885f0 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -25502,6 +25502,8 @@ void Player::CompletedAchievement(AchievementEntry const* entry)
 
 bool Player::LearnTalent(uint32 talentId)
 {
+    uint8 spec = GetActiveSpec();
+
     TalentEntry const* talentInfo = sTalentStore.LookupEntry(talentId);
 
     if (!talentInfo)
@@ -25515,6 +25517,11 @@ bool Player::LearnTalent(uint32 talentId)
     if (getLevel() < (15*talentInfo->TierID + 15))
         return false;
 
+    // Check if such tier talent hasn't been picked already
+    TalentSpecInfo* = GetTalentSpecInfo(spec);
+    if (TalentSpecInfo->Talents[talentInfo->TierID].SpellID != 0)
+        return false;
+
     // spell not set in talent.dbc
     uint32 spellid = talentInfo->SpellID;
     if (spellid == 0)
@@ -25529,14 +25536,14 @@ bool Player::LearnTalent(uint32 talentId)
 
     // learn! (other talent ranks will unlearned at learning)
     LearnSpell(spellid, false);
-    AddTalent(spellid, GetActiveSpec(), true);
+    AddTalent(spellid, spec, true);
 
-    TC_LOG_INFO("misc", "TalentID: %u Spell: %u Spec: %u\n", talentId, spellid, GetActiveSpec());
+    TC_LOG_INFO("misc", "TalentID: %u Spell: %u Spec: %u\n", talentId, spellid, spec);
 
     // set talent tree for player
-    if (!GetTalentSpec(GetActiveSpec()))
+    if (!GetTalentSpec(spec))
     {
-        SetTalentSpec(GetActiveSpec(), talentInfo->SpecID);
+        SetTalentSpec(spec, talentInfo->SpecID);
 
         // Replace default spells by specialization spells
         auto specSpells = sSpecializationSpellsBySpecStore.find(talentInfo->SpecID);