Core/Player: removed InitTalentForLevel as it no longer serves any purpose which isn't already covered by other functions

5 files changed, 10 insertions, 17 deletions

diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 4ad7fd78901..a7405320514 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -490,12 +490,12 @@ bool Player::Create(ObjectGuid::LowType guidlow, WorldPackets::Character::Charac
 
     // Create the default talent group for all new characters
     _talentGroups.emplace_back();
+    UpdateAvailableTalentPoints();
 
     // base stats and related field values
     InitStatsForLevel();
     InitTaxiNodesForLevel();
     InitGlyphsForLevel();
-    InitTalentForLevel();
     InitializeSkillFields();
     InitPrimaryProfessions();                               // to max set before any spell added
 
@@ -2131,7 +2131,8 @@ void Player::GiveLevel(uint8 level)
     SetCreateMana(basemana);
 
     InitGlyphsForLevel();
-    InitTalentForLevel();
+    UpdateAvailableTalentPoints();
+    SendTalentsInfoData();
     InitTaxiNodesForLevel();
 
     UpdateAllStats();
@@ -2172,14 +2173,6 @@ bool Player::IsMaxLevel() const
     return GetLevel() >= m_activePlayerData->MaxLevel;
 }
 
-void Player::InitTalentForLevel()
-{
-    UpdateAvailableTalentPoints();
-
-    if (!GetSession()->PlayerLoading())
-        SendTalentsInfoData(); // update at client
-}
-
 void Player::InitStatsForLevel(bool reapplyMods)
 {
     if (reapplyMods)                                        //reapply stats values only on .reset stats (level) command
@@ -17399,7 +17392,7 @@ bool Player::LoadFromDB(ObjectGuid guid, CharacterDatabaseQueryHolder const& hol
 
     // after spell and quest load
     InitGlyphsForLevel();
-    InitTalentForLevel();
+    UpdateAvailableTalentPoints();
     LearnDefaultSkills();
     LearnCustomSpells();
 
diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h
index deacd1e8c5f..8fadec8d96c 100644
--- a/src/server/game/Entities/Player/Player.h
+++ b/src/server/game/Entities/Player/Player.h
@@ -1865,7 +1865,6 @@ class TC_GAME_API Player final : public Unit, public GridObject<Player>
 
         bool ResetTalents(bool noCost = false);
         uint32 GetNextResetTalentsCost() const;
-        void InitTalentForLevel();
         void SendTalentsInfoData();
 
         void InitGlyphsForLevel();
diff --git a/src/server/scripts/Commands/cs_character.cpp b/src/server/scripts/Commands/cs_character.cpp
index 58f6d982f08..6f7bc77978c 100644
--- a/src/server/scripts/Commands/cs_character.cpp
+++ b/src/server/scripts/Commands/cs_character.cpp
@@ -752,7 +752,6 @@ public:
         if (Player* target = player->GetConnectedPlayer())
         {
             target->GiveLevel(static_cast<uint8>(newlevel));
-            target->InitTalentForLevel();
             target->SetXP(0);
 
             if (handler->needReportToTarget(target))
@@ -799,7 +798,6 @@ public:
         if (Player* target = player->GetConnectedPlayer())
         {
             target->GiveLevel(static_cast<uint8>(newlevel));
-            target->InitTalentForLevel();
             target->SetXP(0);
 
             if (handler->needReportToTarget(target))
diff --git a/src/server/scripts/Commands/cs_group.cpp b/src/server/scripts/Commands/cs_group.cpp
index 24e412e0c93..141b34c9562 100644
--- a/src/server/scripts/Commands/cs_group.cpp
+++ b/src/server/scripts/Commands/cs_group.cpp
@@ -102,7 +102,8 @@ public:
                 if (level != oldlevel)
                 {
                     target->SetLevel(static_cast<uint8>(level));
-                    target->InitTalentForLevel();
+                    target->UpdateAvailableTalentPoints();
+                    target->SendTalentsInfoData();
                     target->SetXP(0);
                 }
 
diff --git a/src/server/scripts/Commands/cs_reset.cpp b/src/server/scripts/Commands/cs_reset.cpp
index 6870f822ebd..f983d3b3b50 100644
--- a/src/server/scripts/Commands/cs_reset.cpp
+++ b/src/server/scripts/Commands/cs_reset.cpp
@@ -142,7 +142,8 @@ public:
         target->InitRunes();
         target->InitStatsForLevel(true);
         target->InitTaxiNodesForLevel();
-        target->InitTalentForLevel();
+        target->UpdateAvailableTalentPoints();
+        target->SendTalentsInfoData();
         target->SetXP(0);
 
         target->_ApplyAllLevelScaleItemMods(true);
@@ -197,7 +198,8 @@ public:
         target->InitRunes();
         target->InitStatsForLevel(true);
         target->InitTaxiNodesForLevel();
-        target->InitTalentForLevel();
+        target->UpdateAvailableTalentPoints();
+        target->SendTalentsInfoData();
 
         return true;
     }