From 50ef4df56f16267062136df46052da3daba9fb28 Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Sat, 19 Jan 2019 07:50:55 +0100 Subject: [PATCH] Core/Pets: use a better way to handle Paladin Guardians classification --- src/server/game/Entities/Creature/TemporarySummon.cpp | 2 +- src/server/game/Entities/Pet/Pet.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/server/game/Entities/Creature/TemporarySummon.cpp b/src/server/game/Entities/Creature/TemporarySummon.cpp index 7ccf3eb49b6..d12c026e520 100644 --- a/src/server/game/Entities/Creature/TemporarySummon.cpp +++ b/src/server/game/Entities/Creature/TemporarySummon.cpp @@ -308,7 +308,7 @@ void Minion::RemoveFromWorld() bool Minion::IsGuardianPet() const { - return IsPet() || IsGuardian() || (m_Properties && m_Properties->Category == SUMMON_CATEGORY_PET); + return IsPet() || (m_Properties && m_Properties->Category == SUMMON_CATEGORY_PET); } bool Minion::IsWarlockMinion() const diff --git a/src/server/game/Entities/Pet/Pet.cpp b/src/server/game/Entities/Pet/Pet.cpp index c81c66d8a32..87bc55fbfda 100644 --- a/src/server/game/Entities/Pet/Pet.cpp +++ b/src/server/game/Entities/Pet/Pet.cpp @@ -854,6 +854,7 @@ bool Guardian::InitStatsForLevel(uint8 petlevel) case CLASS_DEATH_KNIGHT: case CLASS_MAGE: case CLASS_PRIEST: + case CLASS_PALADIN: petType = SUMMON_PET; break; case CLASS_HUNTER: