Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-23 10:26:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Misc: Reduce differences between branches (refactors from 44ac5cbbea)

Browse Source
This commit is contained in:
Shauren
2022-09-02 15:12:28 +02:00
parent 0de520ed92
commit b08a58dec6
2 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/server/game/Spells/SpellMgr.cpp
View File

@@ -2105,15 +2105,12 @@ void SpellMgr::LoadPetLevelupSpellMap()
if (!creatureFamily->SkillLine[j])
continue;
for (uint32 k = 0; k < sSkillLineAbilityStore.GetNumRows(); ++k)
std::vector<SkillLineAbilityEntry const*> const* skillLineAbilities = sDB2Manager.GetSkillLineAbilitiesBySkill(creatureFamily->SkillLine[j]);
if (!skillLineAbilities)
continue;
for (SkillLineAbilityEntry const* skillLine : *skillLineAbilities)
{
SkillLineAbilityEntry const* skillLine = sSkillLineAbilityStore.LookupEntry(k);
if (!skillLine)
continue;
if (skillLine->SkillLine != creatureFamily->SkillLine[j])
continue;
if (skillLine->AcquireMethod != SKILL_LINE_ABILITY_LEARNED_ON_SKILL_LEARN)
continue;

14
src/server/scripts/Commands/cs_learn.cpp
View File

@@ -423,16 +423,12 @@ public:
{
uint32 classmask = player->GetClassMask();
for (uint32 j = 0; j < sSkillLineAbilityStore.GetNumRows(); ++j)
std::vector<SkillLineAbilityEntry const*> const* skillLineAbilities = sDB2Manager.GetSkillLineAbilitiesBySkill(skillId);
if (!skillLineAbilities)
return;
for (SkillLineAbilityEntry const* skillLine : *skillLineAbilities)
{
SkillLineAbilityEntry const* skillLine = sSkillLineAbilityStore.LookupEntry(j);
if (!skillLine)
continue;
// wrong skill
if (skillLine->SkillLine != int32(skillId))
continue;
// not high rank
if (skillLine->SupercedesSpell)
continue;