Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-19 00:48:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.3.4' into '4.3.4'

Browse Source 
Core/Player: Fix talent learning

Broke since 78d1dfd11a where this talent code was randomly deleted somehow

Fixes #71 

See merge request !18
This commit is contained in:
Aokromes
2016-06-22 23:19:08 +00:00
parent 63ef8c1337 5e320797d1
commit a2d6d3a109
1 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/server/game/Entities/Player/Player.cpp
View File

@@ -25451,12 +25451,31 @@ bool Player::LearnTalent(uint32 talentId, uint32 talentRank)
// Find out how many points we have in this field
uint32 spentPoints = 0;
uint32 primaryTreeTalents = 0;
uint32 tTab = talentInfo->TalentTab;
bool isMainTree = GetPrimaryTalentTree(GetActiveSpec()) == tTab || !GetPrimaryTalentTree(GetActiveSpec());
uint32 primaryTreeId = GetPrimaryTalentTree(GetActiveSpec());
bool isMainTree = primaryTreeId == talentInfo->TalentTab || !primaryTreeId;
if (talentInfo->Row > 0 || !isMainTree)
for (uint32 i = 0; i < sTalentStore.GetNumRows(); i++) // Loop through all talents.
if (sTalentStore.LookupEntry(i))
{
for (uint32 i = 0; i < sTalentStore.GetNumRows(); i++) // Loop through all talents.
{
if (const TalentEntry* tmpTalent = sTalentStore.LookupEntry(i)) // Someday, someone needs to revamp the way talents are tracked
{
for (uint8 rank = 0; rank < MAX_TALENT_RANK; rank++)
{
if (tmpTalent->RankID[rank] != 0)
{
if (HasSpell(tmpTalent->RankID[rank]))
{
if (tmpTalent->TalentTab == talentInfo->TalentTab)
spentPoints += (rank + 1);
if (tmpTalent->TalentTab == primaryTreeId)
primaryTreeTalents += (rank + 1);
}
}
}
}
}
}
// not have required min points spent in talent tree
if (spentPoints < (talentInfo->Row * MAX_TALENT_RANK))