From 85113a667f53237c48a01a0df5961fc3e0382204 Mon Sep 17 00:00:00 2001 From: Gent S Date: Wed, 25 Nov 2020 11:45:34 -0500 Subject: [PATCH] Update unsummonW to handle new group gruntwork format --- src/ChatManager.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ChatManager.cpp b/src/ChatManager.cpp index faaefc3..1da29d3 100644 --- a/src/ChatManager.cpp +++ b/src/ChatManager.cpp @@ -278,7 +278,8 @@ void unsummonWCommand(std::string full, std::vector& args, CNSocket return; } - if (TableData::RunningMobs.find(npc->appearanceData.iNPC_ID) == TableData::RunningMobs.end()) { + if (TableData::RunningMobs.find(npc->appearanceData.iNPC_ID) == TableData::RunningMobs.end() + && TableData::RunningGroups.find(npc->appearanceData.iNPC_ID) == TableData::RunningGroups.end()) { ChatManager::sendServerMessage(sock, "/unsummonW: Closest NPC is not a gruntwork mob."); return; } @@ -298,10 +299,9 @@ void unsummonWCommand(std::string full, std::vector& args, CNSocket continue; } - TableData::RunningMobs.erase(leadNpc->groupMember[i]); NPCManager::destroyNPC(leadNpc->groupMember[i]); } - TableData::RunningMobs.erase(leadId); + TableData::RunningGroups.erase(leadId); NPCManager::destroyNPC(leadId); ChatManager::sendServerMessage(sock, "/unsummonW: Mob group destroyed."); return;