From a9b981d619c220d7459a963cac4e989215b638b1 Mon Sep 17 00:00:00 2001 From: talamortis Date: Fri, 30 Nov 2018 00:27:32 +0000 Subject: [PATCH] [Core / Fix] Fixed an issue if charmed creatures was created by spell they wouldn't disappear if owner was too far away from it. Lets take quest Taming the beast for example, Once beast was tamed and player was too far away from the creature it would still appear as a pet and cause issues. --- src/server/game/Entities/Creature/Creature.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index 9e1b3ab12..e168e35ad 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -577,6 +577,12 @@ void Creature::Update(uint32 diff) SelectVictim(); } + Unit* owner = GetCharmerOrOwner(); + if (IsCharmed() && !IsWithinDistInMap(owner, GetMap()->GetVisibilityRange())) + { + RemoveCharmAuras(); + } + if (!IsInEvadeMode() && IsAIEnabled) { // do not allow the AI to be changed during update