Merge pull request azerothcore#69 from hatersgit/master

update forgecache
hatersgit · Feb 27, 2024 · fc37393 · fc37393
2 parents 558d549 + fbc74af
commit fc37393
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/modules/mod-Forge/src/ForgeCache.cpp b/modules/mod-Forge/src/ForgeCache.cpp
@@ -478,7 +478,7 @@ class ForgeCache : public DatabaseScript
         spec->Description = "Skill Specilization";
         spec->Visability = SpecVisibility::PRIVATE;
         spec->SpellIconId = 133743;
-        spec->CharacterSpecTabId = _playerClassFirstSpec[player->getClass()];
+        spec->CharacterSpecTabId = _playerClassFirstSpec[player->getClassMask()];
 
         player->SetSpecsCount(num);
 
@@ -1459,6 +1459,11 @@ class ForgeCache : public DatabaseScript
             newTab->TalentType = (CharacterPointType)talentFields[9].Get<uint8>();
             newTab->TabIndex = talentFields[10].Get<uint32>();
 
+            auto firstSpec = _playerClassFirstSpec.find(newTab->ClassMask);
+            if (firstSpec == _playerClassFirstSpec.end()) {
+                _playerClassFirstSpec[newTab->ClassMask] = newTab->Id;
+            }
+
             for (auto& race : RaceAndClassTabMap)
             {
                 auto bit = (newTab->RaceMask & (1 << (race.first - 1)));
@@ -1472,14 +1477,6 @@ class ForgeCache : public DatabaseScript
 
                     if (classBit != 0 || newTab->ClassMask == 0)
                     {
-                        auto firstSpec = _playerClassFirstSpec.find(classBit);
-                        if (firstSpec != _playerClassFirstSpec.end()) {
-                            if (newTab->Id < firstSpec->second)
-                                _playerClassFirstSpec[classBit] = newTab->Id;
-                        }
-                        else 
-                            _playerClassFirstSpec[classBit] = newTab->Id;
-
                         RaceAndClassTabMap[race.first][wowClass.first].insert(newTab->Id);
                         SpellToTalentTabMap[newTab->SpellIconId] = newTab->Id;
                         TalentTabToSpellMap[newTab->Id] = newTab->SpellIconId;