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

Core/BattlePets: Don't permanently learn battle pet summoning spells (#27201)

Browse Source 
Co-authored-by: Shauren <shauren.trinity@gmail.com>
This commit is contained in:
Meji
2021-11-08 22:29:53 +01:00
committed by GitHub
parent 3ce041e541
commit ebc52afa0a
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/server/game/Spells/SpellEffects.cpp
View File

@@ -2147,10 +2147,17 @@ void Spell::EffectLearnSpell()
if (itemEffect->TriggerType != ITEM_SPELLTRIGGER_LEARN_SPELL_ID)
continue;
player->LearnSpell(itemEffect->SpellID, false);
bool dependent = false;
if (BattlePetSpeciesEntry const* speciesEntry = sSpellMgr->GetBattlePetSpecies(uint32(itemEffect->SpellID)))
{
player->GetSession()->GetBattlePetMgr()->AddPet(speciesEntry->ID, BattlePetMgr::SelectPetDisplay(speciesEntry), BattlePetMgr::RollPetBreed(speciesEntry->ID), BattlePetMgr::GetDefaultPetQuality(speciesEntry->ID));
// If the spell summons a battle pet, we fake that it has been learned and the battle pet is added
// marking as dependent prevents saving the spell to database (intended)
dependent = true;
}
player->LearnSpell(itemEffect->SpellID, dependent);
}
}
@@ -5697,8 +5704,8 @@ void Spell::EffectUncageBattlePet()
if (!speciesEntry)
return;
Player* plr = m_caster->ToPlayer();
BattlePetMgr* battlePetMgr = plr->GetSession()->GetBattlePetMgr();
Player* player = m_caster->ToPlayer();
BattlePetMgr* battlePetMgr = player->GetSession()->GetBattlePetMgr();
if (!battlePetMgr)
return;
@@ -5718,13 +5725,9 @@ void Spell::EffectUncageBattlePet()
battlePetMgr->AddPet(speciesId, displayId, breed, BattlePetBreedQuality(quality), level);
if (speciesEntry->SummonSpellID)
if (!plr->HasSpell(speciesEntry->SummonSpellID))
plr->LearnSpell(speciesEntry->SummonSpellID, false);
player->SendPlaySpellVisual(player, SPELL_VISUAL_UNCAGE_PET, 0, 0, 0.f, false);
plr->SendPlaySpellVisual(plr, SPELL_VISUAL_UNCAGE_PET, 0, 0, 0.f, false);
plr->DestroyItem(m_CastItem->GetBagSlot(), m_CastItem->GetSlot(), true);
player->DestroyItem(m_CastItem->GetBagSlot(), m_CastItem->GetSlot(), true);
m_CastItem = nullptr;
}