nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-03-16 05:55:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(Core): code cleanup (part 2) (#6374)

Browse Source
This commit is contained in:
Francesco Borzì
2021-06-16 20:40:42 +02:00
committed by GitHub
parent 8f7ad83010
commit 466cdb68d6
80 changed files with 198 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/server/game/DungeonFinding/LFGMgr.cpp
View File

@@ -1132,15 +1132,21 @@ namespace lfg
}
if (!deletedGroupsToErase.empty())
for (ObjectGuid const guid : deletedGroupsToErase)
deletedGroups.erase(guid);
{
for (ObjectGuid const toErase : deletedGroupsToErase)
{
deletedGroups.erase(toErase);
}
}
if (!deletedGroups.empty())
for (ObjectGuid const guid : deletedGroups)
{
for (ObjectGuid const deletedGroup : deletedGroups)
{
++deletedCounter;
buffer_deleted << guid;
buffer_deleted << deletedGroup;
}
}
WorldPacket differencePacket(SMSG_UPDATE_LFG_LIST, 1000);
RBPacketBuildDifference(differencePacket, dungeonId, deletedCounter, buffer_deleted, groupCounter, buffer_groups, playerCounter, buffer_players);
@@ -2419,14 +2425,14 @@ namespace lfg
LfgState state = GetState(guid);
// If group is being formed after proposal success do nothing more
LfgGuidSet const& players = it->second.GetPlayers();
for (LfgGuidSet::const_iterator it = players.begin(); it != players.end(); ++it)
for (auto iterator = players.begin(); iterator != players.end(); ++iterator)
{
ObjectGuid guid = (*it);
SetGroup(*it, ObjectGuid::Empty);
ObjectGuid objectGuid = (*iterator);
SetGroup(*iterator, ObjectGuid::Empty);
if (state != LFG_STATE_PROPOSAL)
{
SetState(*it, LFG_STATE_NONE);
SendLfgUpdateParty(guid, LfgUpdateData(LFG_UPDATETYPE_REMOVED_FROM_QUEUE));
SetState(*iterator, LFG_STATE_NONE);
SendLfgUpdateParty(objectGuid, LfgUpdateData(LFG_UPDATETYPE_REMOVED_FROM_QUEUE));
}
}
GroupsStore.erase(it);

3
src/server/game/DungeonFinding/LFGQueue.cpp
View File

@@ -15,10 +15,7 @@
*/
#include "Containers.h"
#include "DBCStores.h"
#include "DBCStructure.h"
#include "Group.h"
#include "GroupMgr.h"
#include "LFGMgr.h"
#include "LFGQueue.h"
#include "Log.h"

2
src/server/game/DungeonFinding/LFGScripts.cpp
View File

@@ -8,7 +8,6 @@
* Interaction between core and LFGScripts
*/
#include "Common.h"
#include "Group.h"
#include "LFGMgr.h"
#include "LFGScripts.h"
@@ -16,7 +15,6 @@
#include "Player.h"
#include "ScriptMgr.h"
#include "SharedDefines.h"
#include "WorldSession.h"
namespace lfg
{