From 1b33551faba76d0179178635430ba713c44c4073 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Mon, 24 Aug 2020 11:18:57 -0400 Subject: [PATCH] Core/Pet: Fix an issue that was causing lower ranks of pet spells to remain in DB Port From (https://github.com/TrinityCore/TrinityCore/commit/5e3170d58e82693e7ceb29d4d9c5346906bdd98b) --- Source/Game/Entities/Pet.cs | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/Source/Game/Entities/Pet.cs b/Source/Game/Entities/Pet.cs index a3d219277..3fa937081 100644 --- a/Source/Game/Entities/Pet.cs +++ b/Source/Game/Entities/Pet.cs @@ -1028,24 +1028,22 @@ namespace Game.Entities if (petSpell != null) { if (petSpell.state == PetSpellState.Removed) - { - m_spells.Remove(spellId); state = PetSpellState.Changed; - } - else if (state == PetSpellState.Unchanged && petSpell.state != PetSpellState.Unchanged) - { - // can be in case spell loading but learned at some previous spell loading - petSpell.state = PetSpellState.Unchanged; - - if (active == ActiveStates.Enabled) - ToggleAutocast(spellInfo, true); - else if (active == ActiveStates.Disabled) - ToggleAutocast(spellInfo, false); - - return false; - } else - return false; + { + if (state == PetSpellState.Unchanged && petSpell.state != PetSpellState.Unchanged) + { + // can be in case spell loading but learned at some previous spell loading + petSpell.state = PetSpellState.Unchanged; + + if (active == ActiveStates.Enabled) + ToggleAutocast(spellInfo, true); + else if (active == ActiveStates.Disabled) + ToggleAutocast(spellInfo, false); + + return false; + } + } } PetSpell newspell = new PetSpell();