mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-14 16:37:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[11938] Replace use of HashMapFolder.Find<Player> with ObjectAccessor::FindPlayer wrapper

Browse source
This commit is contained in:
Schmoozerd 2012-04-01 04:52:14 +02:00
parent feb139de71
commit 95ce0c927c
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/game/GroupHandler.cpp
View file

@ -811,8 +811,8 @@ void WorldSession::HandleRequestPartyMemberStatsOpcode( WorldPacket &recv_data )
ObjectGuid guid; ObjectGuid guid;
recv_data >> guid; recv_data >> guid;
Player * player = HashMapHolder<Player>::Find(guid); Player* player = ObjectAccessor::FindPlayer(guid, false);
if(!player) if (!player)
{ {
WorldPacket data(SMSG_PARTY_MEMBER_STATS_FULL, 3+4+2); WorldPacket data(SMSG_PARTY_MEMBER_STATS_FULL, 3+4+2);
data << uint8(0); // only for SMSG_PARTY_MEMBER_STATS_FULL, probably arena/bg related data << uint8(0); // only for SMSG_PARTY_MEMBER_STATS_FULL, probably arena/bg related

4
src/game/ObjectAccessor.cpp
View file

@ -78,7 +78,7 @@ Player* ObjectAccessor::FindPlayer(ObjectGuid guid, bool inWorld /*= true*/)
if (!guid) if (!guid)
return NULL; return NULL;
Player* plr = HashMapHolder<Player>::Find(guid);; Player* plr = HashMapHolder<Player>::Find(guid);
if (!plr || (!plr->IsInWorld() && inWorld)) if (!plr || (!plr->IsInWorld() && inWorld))
return NULL; return NULL;
@ -107,7 +107,7 @@ ObjectAccessor::SaveAllPlayers()
void ObjectAccessor::KickPlayer(ObjectGuid guid) void ObjectAccessor::KickPlayer(ObjectGuid guid)
{ {
if (Player* p = HashMapHolder<Player>::Find(guid)) if (Player* p = ObjectAccessor::FindPlayer(guid, false))
{ {
WorldSession* s = p->GetSession(); WorldSession* s = p->GetSession();
s->KickPlayer(); // mark session to remove at next session list update s->KickPlayer(); // mark session to remove at next session list update

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "11937" #define REVISION_NR "11938"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__