diff options
Diffstat (limited to 'src/server/scripts/Commands')
| -rw-r--r-- | src/server/scripts/Commands/cs_debug.cpp | 6 | ||||
| -rw-r--r-- | src/server/scripts/Commands/cs_npc.cpp | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/server/scripts/Commands/cs_debug.cpp b/src/server/scripts/Commands/cs_debug.cpp index c966330b04e..e1ca92ce670 100644 --- a/src/server/scripts/Commands/cs_debug.cpp +++ b/src/server/scripts/Commands/cs_debug.cpp @@ -50,6 +50,8 @@ EndScriptData */ #include "WorldSession.h" #include <fstream> #include <limits> +#include <map> +#include <set> #include <sstream> class debug_commandscript : public CommandScript @@ -1522,7 +1524,7 @@ public: return false; } auto const& spawnGroups = *instance->_instanceSpawnGroups; - std::unordered_map<uint32, std::set<std::tuple<bool, uint8, uint8>>> store; + std::map<uint32, std::set<std::tuple<bool, uint8, uint8>>> store; for (InstanceSpawnGroupInfo const& info : spawnGroups) { if (groupID && info.SpawnGroupId != groupID) @@ -1579,7 +1581,7 @@ public: } } else - handler->PSendSysMessage(" | |-- '%s' could've been %s if boss state %u matched mask %u; but it is %s -> %u, which does not match.", + handler->PSendSysMessage(" | |-- '%s' could've been %s if boss state %u matched mask 0x%02x; but it is %s -> 0x%02x, which does not match.", groupData->name, isSpawn ? "allowed to spawn" : "blocked from spawning", bossStateId, std::get<2>(tuple), InstanceScript::GetBossStateName(actualState), (1 << actualState)); } if (isBlocked) diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp index b33548acc68..23f15dd2f1f 100644 --- a/src/server/scripts/Commands/cs_npc.cpp +++ b/src/server/scripts/Commands/cs_npc.cpp @@ -246,8 +246,6 @@ bool HandleNpcSpawnGroup(ChatHandler* handler, char const* args) } handler->PSendSysMessage(LANG_SPAWNGROUP_SPAWNCOUNT, creatureList.size()); - for (WorldObject* obj : creatureList) - handler->PSendSysMessage("%s (%s)", obj->GetName(), obj->GetGUID().ToString().c_str()); return true; } @@ -278,12 +276,14 @@ bool HandleNpcDespawnGroup(ChatHandler* handler, char const* args) Player* player = handler->GetSession()->GetPlayer(); - if (!player->GetMap()->SpawnGroupDespawn(groupId, deleteRespawnTimes)) + size_t n = 0; + if (!player->GetMap()->SpawnGroupDespawn(groupId, deleteRespawnTimes, &n)) { handler->PSendSysMessage(LANG_SPAWNGROUP_BADGROUP, groupId); handler->SetSentErrorMessage(true); return false; } + handler->PSendSysMessage("Despawned a total of %zu objects.", n); return true; } |