From 77233dd07324d1b56762851276b680d80b8fcafe Mon Sep 17 00:00:00 2001 From: Treeston Date: Tue, 24 Jul 2018 21:15:06 +0200 Subject: [PATCH] Core/GameObject: Hunter traps now always put the Hunter in combat with the target when triggered. Closes #21847. --- src/server/game/Entities/GameObject/GameObject.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index 0e4452646a3..880e069929d 100644 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -693,6 +693,10 @@ void GameObject::Update(uint32 diff) } else if (Unit* target = ObjectAccessor::GetUnit(*this, m_lootStateUnitGUID)) { + // Set in combat with owner + if (Unit* owner = GetOwner()) + target->EngageWithTarget(owner); + // Some traps do not have a spell but should be triggered if (goInfo->trap.spellId) CastSpell(target, goInfo->trap.spellId);