From 133334a902b705dae6f7e92bb1009b84cf1c51d2 Mon Sep 17 00:00:00 2001 From: Shauren Date: Mon, 17 Oct 2022 23:11:46 +0200 Subject: Core/Loot: Implemented personal loot and tag sharing for non-boss loot --- src/server/scripts/Commands/cs_debug.cpp | 12 +++++++++--- src/server/scripts/Commands/cs_npc.cpp | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) (limited to 'src/server/scripts/Commands') diff --git a/src/server/scripts/Commands/cs_debug.cpp b/src/server/scripts/Commands/cs_debug.cpp index c242f96ae94..26e2baa9c81 100644 --- a/src/server/scripts/Commands/cs_debug.cpp +++ b/src/server/scripts/Commands/cs_debug.cpp @@ -546,9 +546,15 @@ public: if (!target) return false; - handler->PSendSysMessage("Loot recipient for creature %s (%s, SpawnID " UI64FMTD ") is %s", - target->GetName().c_str(), target->GetGUID().ToString().c_str(), target->GetSpawnId(), - target->hasLootRecipient() ? (target->GetLootRecipient() ? target->GetLootRecipient()->GetName().c_str() : "offline") : "no loot recipient"); + handler->PSendSysMessage("Loot recipients for creature %s (%s, SpawnID " UI64FMTD ") are:", + target->GetName().c_str(), target->GetGUID().ToString().c_str(), target->GetSpawnId()); + + for (ObjectGuid tapperGuid : target->GetTapList()) + { + Player* tapper = ObjectAccessor::GetPlayer(*target, tapperGuid); + handler->PSendSysMessage("* %s", tapper ? tapper->GetName().c_str() : "offline"); + } + return true; } diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp index 9340b0f292f..4305ba8b10e 100644 --- a/src/server/scripts/Commands/cs_npc.cpp +++ b/src/server/scripts/Commands/cs_npc.cpp @@ -1200,7 +1200,7 @@ public: } Loot const* loot = creatureTarget->m_loot.get(); - if (!creatureTarget->isDead() || !loot || loot->empty()) + if (!creatureTarget->isDead() || !loot || loot->isLooted()) { handler->PSendSysMessage(LANG_COMMAND_NOT_DEAD_OR_NO_LOOT, creatureTarget->GetName().c_str()); handler->SetSentErrorMessage(true); -- cgit v1.2.3