diff options
| author | Shauren <shauren.trinity@gmail.com> | 2014-10-18 15:54:30 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2014-10-18 15:54:30 +0200 |
| commit | c238e8faffddad85e5324e102e9a77df0c87e942 (patch) | |
| tree | 8ae70a6f1377779c14347ccccc16daa09fac6dea /src/server/game/Handlers/MiscHandler.cpp | |
| parent | 1d1b3269c155c3aede43ffe25660e3d655cc3f99 (diff) | |
| parent | 0de1603944fe96253e02a1564881c80fe6519ebb (diff) | |
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Battlegrounds/ArenaTeamMgr.cpp
src/server/game/Handlers/GroupHandler.cpp
Diffstat (limited to 'src/server/game/Handlers/MiscHandler.cpp')
| -rw-r--r-- | src/server/game/Handlers/MiscHandler.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Handlers/MiscHandler.cpp b/src/server/game/Handlers/MiscHandler.cpp index ba6c2e1cc5a..a149d066a05 100644 --- a/src/server/game/Handlers/MiscHandler.cpp +++ b/src/server/game/Handlers/MiscHandler.cpp @@ -258,7 +258,7 @@ void WorldSession::HandleWhoOpcode(WorldPacket& recvData) boost::shared_lock<boost::shared_mutex> lock(*HashMapHolder<Player>::GetLock()); - HashMapHolder<Player>::MapType const& m = sObjectAccessor->GetPlayers(); + HashMapHolder<Player>::MapType const& m = ObjectAccessor::GetPlayers(); for (HashMapHolder<Player>::MapType::const_iterator itr = m.begin(); itr != m.end(); ++itr) { Player* target = itr->second; @@ -1375,7 +1375,7 @@ void WorldSession::HandleWhoisOpcode(WorldPacket& recvData) return; } - Player* player = sObjectAccessor->FindConnectedPlayerByName(charname); + Player* player = ObjectAccessor::FindConnectedPlayerByName(charname); if (!player) { |