From 40d882b7544cff556f5e2dc6ac570c3fee5b9659 Mon Sep 17 00:00:00 2001 From: Giacomo Pozzoni Date: Mon, 10 May 2021 22:01:41 +0200 Subject: Core/Pet: Attempt to fix assertions triggered when summoning pets (#26501) * Core/Pet: Attempt to fix an assertion triggered when re-summoning the current pet * Core/Pet: Attempt to fix an assertion triggered when stabling a pet while in a vehicle * Core/Pet: Attempt to fix an assertion triggered when stabling a pet and casting spell 6962 * Core/Pet: Attempt to fix an assertion triggered when casting spell 6962 while being dead * Core/Pet: Attempt to fix an assertion triggered when summoning a pet while on vehicle 34775 * Handle cases in a generic way * Code cleanup * Core/Pet: Attempt to fix an assertion triggered when summoning a pet while on vehicle 34775 with a new character (cherry picked from commit e203ecda88a327c4e93588f39cc4ffdcf99b30f7) --- src/server/game/Handlers/NPCHandler.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/server/game/Handlers/NPCHandler.cpp') diff --git a/src/server/game/Handlers/NPCHandler.cpp b/src/server/game/Handlers/NPCHandler.cpp index 9854aaa6710..4d618e612ec 100644 --- a/src/server/game/Handlers/NPCHandler.cpp +++ b/src/server/game/Handlers/NPCHandler.cpp @@ -598,8 +598,6 @@ void WorldSession::HandleUnstablePet(WorldPacket& recvData) } else { - std::swap(*stabledPet, petStable->CurrentPet); - // update current pet slot in db immediately to maintain slot consistency, dismissed pet was already saved CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_CHAR_PET_SLOT_BY_ID); stmt->setUInt8(0, PET_SAVE_AS_CURRENT); -- cgit v1.2.3