server/mangos
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Core] Fix crash during gm .saveall

Browse Source
This commit is contained in:
xfury 2016-01-20 21:07:19 +00:00 committed by Antz
parent f8f4d90dcf
commit 03ea10a6b8
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/game/Object/ObjectAccessor.cpp
View File

@ -105,10 +105,15 @@ Player* ObjectAccessor::FindPlayerByName(const char* name)
void void
ObjectAccessor::SaveAllPlayers() ObjectAccessor::SaveAllPlayers()
{ {
HashMapHolder<Player>::ReadGuard g(HashMapHolder<Player>::GetLock()); SessionMap const& smap = sWorld.GetAllSessions();
HashMapHolder<Player>::MapType& m = sObjectAccessor.GetPlayers(); SessionMap::const_iterator iter;
for (HashMapHolder<Player>::MapType::iterator itr = m.begin(); itr != m.end(); ++itr) for (iter = smap.begin(); iter != smap.end(); ++iter){
{ itr->second->SaveToDB(); } if (Player* player = iter->second->GetPlayer()){
if (player->IsInWorld()){
player->SaveToDB();
}
}
}
} }
void ObjectAccessor::KickPlayer(ObjectGuid guid) void ObjectAccessor::KickPlayer(ObjectGuid guid)

2
src/game/WorldHandlers/World.h
View File

@ -412,6 +412,8 @@ enum RealmZone
REALM_ZONE_CN9 = 29 // basic-Latin at create, any at login REALM_ZONE_CN9 = 29 // basic-Latin at create, any at login
}; };
typedef std::unordered_map<uint32, WorldSession*> SessionMap;
/// Storage class for commands issued for delayed execution /// Storage class for commands issued for delayed execution
struct CliCommandHolder struct CliCommandHolder
{ {