From 5df7ffaf847e9dd5b27b4f6a27f6768f30885992 Mon Sep 17 00:00:00 2001 From: Treeston Date: Tue, 24 Jul 2018 21:15:06 +0200 Subject: 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 ++++ src/server/scripts/Pet/pet_hunter.cpp | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index e24f37b885a..1c5dfab9222 100644 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -692,6 +692,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 CastSpellExtraArgs args; args.SetOriginalCaster(GetOwnerGUID()); diff --git a/src/server/scripts/Pet/pet_hunter.cpp b/src/server/scripts/Pet/pet_hunter.cpp index c5300523175..c1d5fcd6cee 100644 --- a/src/server/scripts/Pet/pet_hunter.cpp +++ b/src/server/scripts/Pet/pet_hunter.cpp @@ -78,7 +78,7 @@ class npc_pet_hunter_snake_trap : public CreatureScript } // Redefined for random target selection: - void MoveInLineOfSight(Unit* who) override { } + void MoveInLineOfSight(Unit* /*who*/) override { } void UpdateAI(uint32 diff) override { -- cgit v1.2.3