From 94e60194ae495d2697e93f389c3c182dbc8b28de Mon Sep 17 00:00:00 2001 From: Hondacrx Date: Mon, 25 Aug 2025 22:05:35 -0400 Subject: [PATCH] Core/BattlePets: Fix using moved-from variable when adding new pet Port From (https://github.com/TrinityCore/TrinityCore/commit/f58a5fe67430eac922a309b244eff7a396aa0adc) --- Source/Game/BattlePets/BattlePetManager.cs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Source/Game/BattlePets/BattlePetManager.cs b/Source/Game/BattlePets/BattlePetManager.cs index bbfe7c50e..8cad99f23 100644 --- a/Source/Game/BattlePets/BattlePetManager.cs +++ b/Source/Game/BattlePets/BattlePetManager.cs @@ -391,17 +391,16 @@ namespace Game.BattlePets if (!battlePetSpecies.HasFlag(BattlePetSpeciesFlags.WellKnown)) // Not learnable return; + ObjectGuid guid = ObjectGuid.Create(HighGuid.BattlePet, Global.ObjectMgr.GetGenerator(HighGuid.BattlePet).Generate()); + BattlePet pet = new(); - pet.PacketInfo.Guid = ObjectGuid.Create(HighGuid.BattlePet, Global.ObjectMgr.GetGenerator(HighGuid.BattlePet).Generate()); + pet.PacketInfo.Guid = guid; pet.PacketInfo.Species = species; pet.PacketInfo.CreatureID = battlePetSpecies.CreatureID; pet.PacketInfo.DisplayID = display; pet.PacketInfo.Level = level; - pet.PacketInfo.Exp = 0; - pet.PacketInfo.Flags = 0; pet.PacketInfo.Breed = breed; pet.PacketInfo.Quality = (byte)quality; - pet.PacketInfo.Name = ""; pet.CalculateStats(); pet.PacketInfo.Health = pet.PacketInfo.MaxHealth; @@ -417,7 +416,7 @@ namespace Game.BattlePets pet.SaveInfo = BattlePetSaveInfo.New; - _pets[pet.PacketInfo.Guid.GetCounter()] = pet; + _pets[guid.GetCounter()] = pet; List updates = [pet]; SendUpdates(updates, true);