From 6cb375e0151eb12adfde8ef97658abd524a19b98 Mon Sep 17 00:00:00 2001 From: blinkysc <37940565+blinkysc@users.noreply.github.com> Date: Thu, 26 Mar 2026 19:28:07 -0500 Subject: [PATCH] fix(Core/Commands): Show combat refs in .debug hostile output (#25248) Co-authored-by: blinkysc --- src/server/scripts/Commands/cs_debug.cpp | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/server/scripts/Commands/cs_debug.cpp b/src/server/scripts/Commands/cs_debug.cpp index cda1b6244d..8c80529d96 100644 --- a/src/server/scripts/Commands/cs_debug.cpp +++ b/src/server/scripts/Commands/cs_debug.cpp @@ -1042,6 +1042,22 @@ public: } handler->SendSysMessage("End of threatened by me list."); + + // Also show combat refs that may not appear in the threat list + // (e.g. creatures without threat lists like triggers/environmental hazards) + handler->PSendSysMessage("Combat refs (InCombat: {} | HasCombat: {})", target->IsInCombat(), target->GetCombatManager().HasCombat()); + for (auto const& ref : target->GetCombatManager().GetPvECombatRefs()) + { + Unit* unit = ref.second->GetOther(target); + handler->PSendSysMessage(" [PvE] {} ({}) Entry: {}", unit->GetName(), unit->GetGUID().ToString(), + unit->IsCreature() ? unit->ToCreature()->GetEntry() : 0); + } + for (auto const& ref : target->GetCombatManager().GetPvPCombatRefs()) + { + Unit* unit = ref.second->GetOther(target); + handler->PSendSysMessage(" [PvP] {} ({})", unit->GetName(), unit->GetGUID().ToString()); + } + return true; }