Fix crash when pets with Eluna AI enter combat but the controller doe…

…s not
Eluna-Ports · Dec 14, 2023 · 16b1f40 · 16b1f40
1 parent d994fb6
commit 16b1f40
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/src/game/Entities/Unit.cpp b/src/game/Entities/Unit.cpp
@@ -8532,6 +8532,13 @@ void Unit::SetInCombatState(bool PvP, Unit* enemy)
                     if (PvP || creatureNotInCombat)
                         enemy->GetCombatManager().TriggerCombatTimer(controller);
                 }
+#ifdef BUILD_ELUNA
+                else if (elunaEvents)
+                {
+                    controller->SetInCombatWith(enemy); // player needs to enter combat with summoned Eluna pet
+                    enemy->AddThreat(controller);
+                }
+#endif
                 else
                 {
                     MANGOS_ASSERT(controller->AI()); // a player without UNIT_FLAG_PLAYER_CONTROLLED should always have AI