Merge 8075486418f9c4526d0b5d6a9d995efbd5ee27be into 09e0343491f2d91e18a2aa75f379e8d163386ea4

This commit is contained in:
blinkysc 2025-11-08 11:40:26 +08:00 committed by GitHub
commit 302695ed03
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -1535,7 +1535,7 @@ bool Player::TeleportTo(uint32 mapid, float x, float y, float z, float orientati
CombatStop();
// remove pet on map change
if (pet)
if (pet && !(options & TELE_TO_NOT_UNSUMMON_PET))
UnsummonPetTemporaryIfAny();
// remove all dyn objects