Merge branch 'master' into Playerbot

This commit is contained in:
Yunfan Li
2023-08-29 20:50:49 +08:00
87 changed files with 74 additions and 108 deletions
+1 -1
View File
@@ -68,7 +68,7 @@ void WorldSession::HandleLfgJoinOpcode(WorldPackets::LFG::LFGJoin& packet)
}
LOG_DEBUG("network", "CMSG_LFG_JOIN [{}] roles: {}, Dungeons: {}, Comment: {}",
GetPlayerInfo().c_str(), packet.Roles, newDungeons.size(), packet.Comment.c_str());
GetPlayerInfo(), packet.Roles, newDungeons.size(), packet.Comment);
sLFGMgr->JoinLfg(GetPlayer(), uint8(packet.Roles), newDungeons, packet.Comment);
}
-2
View File
@@ -22,7 +22,6 @@
#include "CharacterPackets.h"
#include "Chat.h"
#include "Common.h"
#include "CreatureAI.h"
#include "DBCEnums.h"
#include "DatabaseEnv.h"
#include "GameObjectAI.h"
@@ -30,7 +29,6 @@
#include "GossipDef.h"
#include "Group.h"
#include "GuildMgr.h"
#include "InstanceScript.h"
#include "Language.h"
#include "Log.h"
#include "LootMgr.h"
@@ -19,7 +19,6 @@
#include "ArenaTeamMgr.h"
#include "Guild.h"
#include "GuildMgr.h"
#include "Language.h"
#include "Log.h"
#include "ObjectMgr.h"
#include "Opcodes.h"