From 5734a7d1cce9bc29ab442ce1f45193c85e526da1 Mon Sep 17 00:00:00 2001 From: Niam5 Date: Mon, 27 May 2024 14:52:27 -0700 Subject: [PATCH] Fix NPC pets not entering combat correctly when aggro'd Fixes #13 --- src/game/Entities/Unit.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/game/Entities/Unit.cpp b/src/game/Entities/Unit.cpp index 38580b59c1..7cb6e7995d 100644 --- a/src/game/Entities/Unit.cpp +++ b/src/game/Entities/Unit.cpp @@ -8534,7 +8534,7 @@ void Unit::SetInCombatState(bool PvP, Unit* enemy) enemy->GetCombatManager().TriggerCombatTimer(controller); } #ifdef BUILD_ELUNA - else if (elunaEvents) + else if (elunaEvents && controller->IsPlayer()) { controller->SetInCombatWith(enemy); // player needs to enter combat with summoned Eluna pet enemy->AddThreat(controller);