aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Handlers/PetHandler.cpp
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2023-09-10 11:54:09 +0200
committerShauren <shauren.trinity@gmail.com>2023-09-10 11:54:09 +0200
commita667d723bf18ffba9b7b25c4fff1223d23e55524 (patch)
tree3c30f5668407de815cdb6448c3932dfab98b89cf /src/server/game/Handlers/PetHandler.cpp
parentedb103eadbee04aa2cd6746409e0fe297ba15958 (diff)
Core/Pets: Improved pet despawn behavior when mounting
* Pets will now only be despawned when starting to fly * Fixed crash when summoning a pet that is different than the one that was despawned by flying Closes #29303
Diffstat (limited to 'src/server/game/Handlers/PetHandler.cpp')
-rw-r--r--src/server/game/Handlers/PetHandler.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/server/game/Handlers/PetHandler.cpp b/src/server/game/Handlers/PetHandler.cpp
index d05e6c5b181..268c839f237 100644
--- a/src/server/game/Handlers/PetHandler.cpp
+++ b/src/server/game/Handlers/PetHandler.cpp
@@ -62,6 +62,9 @@ void WorldSession::HandleDismissCritter(WorldPackets::Pet::DismissCritter& packe
void WorldSession::HandlePetAction(WorldPackets::Pet::PetAction& packet)
{
+ if (_player->IsMounted())
+ return;
+
ObjectGuid guid1 = packet.PetGUID; //pet guid
ObjectGuid guid2 = packet.TargetGUID; //tag guid