Merge pull request #13546 from Intel/talentupdate

Core/Talents

2 files changed, 6 insertions, 2 deletions

diff --git a/src/server/scripts/Commands/cs_learn.cpp b/src/server/scripts/Commands/cs_learn.cpp
index 81499567b72..2cf97403595 100644
--- a/src/server/scripts/Commands/cs_learn.cpp
+++ b/src/server/scripts/Commands/cs_learn.cpp
@@ -204,7 +204,7 @@ public:
 
             // learn highest rank of talent and learn all non-talent spell ranks (recursive by tree)
             player->LearnSpellHighestRank(talentInfo->SpellID);
-            player->AddTalent(talentInfo->SpellID, player->GetActiveSpec(), true);
+            player->AddTalent(talentInfo->SpellID, player->GetActiveTalentGroup());
         }
 
         handler->SendSysMessage(LANG_COMMAND_LEARN_CLASS_TALENTS);
diff --git a/src/server/scripts/Commands/cs_reset.cpp b/src/server/scripts/Commands/cs_reset.cpp
index 9d2621c0010..4a58a7f7e5d 100644
--- a/src/server/scripts/Commands/cs_reset.cpp
+++ b/src/server/scripts/Commands/cs_reset.cpp
@@ -204,6 +204,7 @@ public:
         Player* target;
         ObjectGuid targetGuid;
         std::string targetName;
+        /* TODO: 6.x remove/update pet talents
         if (!handler->extractPlayerTarget((char*)args, &target, &targetGuid, &targetName))
         {
             // Try reset talents as Hunter Pet
@@ -227,19 +228,22 @@ public:
             handler->SetSentErrorMessage(true);
             return false;
         }
+        */
 
         if (target)
         {
             target->ResetTalents(true);
-            target->SendTalentsInfoData(false);
+            target->SendTalentsInfoData();
             ChatHandler(target->GetSession()).SendSysMessage(LANG_RESET_TALENTS);
             if (!handler->GetSession() || handler->GetSession()->GetPlayer() != target)
                 handler->PSendSysMessage(LANG_RESET_TALENTS_ONLINE, handler->GetNameLink(target).c_str());
 
+            /* TODO: 6.x remove/update pet talents
             Pet* pet = target->GetPet();
             Pet::resetTalentsForAllPetsOf(target, pet);
             if (pet)
                 target->SendTalentsInfoData(true);
+            */
             return true;
         }
         else if (!targetGuid.IsEmpty())