From 09428ebad23b2d408cbb20d2608aa988cd473b0e Mon Sep 17 00:00:00 2001 From: insider42 Date: Wed, 30 Dec 2009 22:00:30 +0300 Subject: [PATCH] [9088] Prevent unsummon permanent pets at arenas. Signed-off-by: VladimirMangos --- src/game/Unit.cpp | 2 +- src/shared/revision_nr.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index f60f1f3e9..ef4f5dcc4 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -9899,7 +9899,7 @@ void Unit::Mount(uint32 mount, uint32 spellId) // Normal case (Unsummon only permanent pet) else if (Pet* pet = GetPet()) { - if (pet->IsPermanentPetFor((Player*)this)) + if (pet->IsPermanentPetFor((Player*)this) && !((Player*)this)->InArena()) ((Player*)this)->UnsummonPetTemporaryIfAny(); else pet->ApplyModeFlags(PET_MODE_DISABLE_ACTIONS,true); diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 869fbebed..851d74163 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "9087" + #define REVISION_NR "9088" #endif // __REVISION_NR_H__ -- 2.11.4.GIT