From a6425c36309f59eebbd1369dbfc5b09099a4dde5 Mon Sep 17 00:00:00 2001
From: Jelle Meeus <sogladev@gmail.com>
Date: Mon, 3 Jun 2024 05:42:06 +0200
Subject: [PATCH] fix(Core/PetHandler): when dismissing a charmed unit owned by
 another unit; stop the charm instead of despawning (#18989)

https://github.com/TrinityCore/TrinityCore/commit/2cdea49d81ce2bb4e19df594c019a42fb4ba0c5b
---
 src/server/game/Handlers/PetHandler.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/server/game/Handlers/PetHandler.cpp b/src/server/game/Handlers/PetHandler.cpp
index 3d283f5ed..bf0ab70fa 100644
--- a/src/server/game/Handlers/PetHandler.cpp
+++ b/src/server/game/Handlers/PetHandler.cpp
@@ -287,10 +287,7 @@ void WorldSession::HandlePetActionHelper(Unit* pet, ObjectGuid guid1, uint32 spe
                 case COMMAND_ABANDON:                       // abandon (hunter pet) or dismiss (summoned pet)
                     if (pet->GetCharmerGUID() == GetPlayer()->GetGUID())
                     {
-                        if (pet->IsSummon())
-                            pet->ToTempSummon()->UnSummon();
-                        else
-                            _player->StopCastingCharm();
+                        _player->StopCastingCharm();
                     }
                     else if (pet->GetOwnerGUID() == GetPlayer()->GetGUID())
                     {