sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(Core/Threading): replace ace threading (#4821)

Browse Source
This commit is contained in:
Kargatum
2021-04-17 00:45:29 +07:00
committed by GitHub
parent b9e84d8278
commit b2861be1cd
50 changed files with 300 additions and 342 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp
+4 -4
View File
@@ -115,7 +115,7 @@ void OutdoorPvPMgr::HandlePlayerEnterZone(Player* player, uint32 zoneid)
if (itr == m_OutdoorPvPMap.end())
return;
ACORE_GUARD(ACE_Thread_Mutex, _lock); // pussywizard
std::lock_guard<std::mutex> guard(_lock); // pussywizard
if (itr->second->HasPlayer(player))
return;
@@ -132,7 +132,7 @@ void OutdoorPvPMgr::HandlePlayerLeaveZone(Player* player, uint32 zoneid)
if (itr == m_OutdoorPvPMap.end())
return;
ACORE_GUARD(ACE_Thread_Mutex, _lock); // pussywizard
std::lock_guard<std::mutex> guard(_lock); // pussywizard
// teleport: remove once in removefromworld, once in updatezone
if (!itr->second->HasPlayer(player))
@@ -188,7 +188,7 @@ ZoneScript* OutdoorPvPMgr::GetZoneScript(uint32 zoneId)
bool OutdoorPvPMgr::HandleOpenGo(Player* player, uint64 guid)
{
ACORE_GUARD(ACE_Thread_Mutex, _lock); // pussywizard
std::lock_guard<std::mutex> guard(_lock); // pussywizard
for (OutdoorPvPSet::iterator itr = m_OutdoorPvPSet.begin(); itr != m_OutdoorPvPSet.end(); ++itr)
{
if ((*itr)->HandleOpenGo(player, guid))
@@ -199,7 +199,7 @@ bool OutdoorPvPMgr::HandleOpenGo(Player* player, uint64 guid)
void OutdoorPvPMgr::HandleGossipOption(Player* player, uint64 guid, uint32 gossipid)
{
ACORE_GUARD(ACE_Thread_Mutex, _lock); // pussywizard
std::lock_guard<std::mutex> guard(_lock); // pussywizard
for (OutdoorPvPSet::iterator itr = m_OutdoorPvPSet.begin(); itr != m_OutdoorPvPSet.end(); ++itr)
{
if ((*itr)->HandleGossipOption(player, guid, gossipid))
src/server/game/OutdoorPvP/OutdoorPvPMgr.h
+1 -1
View File
@@ -70,7 +70,7 @@ public:
void HandleDropFlag(Player* player, uint32 spellId);
// pussywizard: lock required because different functions affect m_players
ACE_Thread_Mutex _lock;
std::mutex _lock;
private:
typedef std::vector<OutdoorPvP*> OutdoorPvPSet;