From 408366f39f998729daad9bab02e1040c29c20146 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefano=20Borz=C3=AC?= Date: Mon, 17 Aug 2020 10:36:42 +0200 Subject: [PATCH] chore(unit-object-accessor): add findConnectedPlayer to object accessor (#3155) --- src/server/game/Globals/ObjectAccessor.cpp | 9 +++++++-- src/server/game/Globals/ObjectAccessor.h | 4 +++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/server/game/Globals/ObjectAccessor.cpp b/src/server/game/Globals/ObjectAccessor.cpp index 984f4c799..9e633da5f 100644 --- a/src/server/game/Globals/ObjectAccessor.cpp +++ b/src/server/game/Globals/ObjectAccessor.cpp @@ -169,7 +169,7 @@ Player* ObjectAccessor::FindPlayer(uint64 guid) Player* ObjectAccessor::FindPlayerInOrOutOfWorld(uint64 guid) { - return GetObjectInOrOutOfWorld(guid, (Player*)NULL); + return GetObjectInOrOutOfWorld(guid, (Player*)NULL); } Unit* ObjectAccessor::FindUnit(uint64 guid) @@ -177,6 +177,11 @@ Unit* ObjectAccessor::FindUnit(uint64 guid) return GetObjectInWorld(guid, (Unit*)NULL); } +Player* ObjectAccessor::FindConnectedPlayer(uint64 const& guid) +{ + return HashMapHolder::Find(guid); +} + Player* ObjectAccessor::FindPlayerByName(std::string const& name, bool checkInWorld) { /*ACORE_READ_GUARD(HashMapHolder::LockType, *HashMapHolder::GetLock()); @@ -486,7 +491,7 @@ void ObjectAccessor::Update(uint32 /*diff*/) } void Map::BuildAndSendUpdateForObjects() -{ +{ UpdateDataMapType update_players; UpdatePlayerSet player_set; diff --git a/src/server/game/Globals/ObjectAccessor.h b/src/server/game/Globals/ObjectAccessor.h index 459dc19a2..505aedfef 100644 --- a/src/server/game/Globals/ObjectAccessor.h +++ b/src/server/game/Globals/ObjectAccessor.h @@ -188,8 +188,10 @@ class ObjectAccessor // ACCESS LIKE THAT IS NOT THREAD SAFE static Pet* FindPet(uint64); static Player* FindPlayer(uint64); - static Player* FindPlayerInOrOutOfWorld(uint64 m_guid); + static Player* FindPlayerInOrOutOfWorld(uint64 m_guid); + static Unit* FindUnit(uint64); + static Player* FindConnectedPlayer(uint64 const&); static Player* FindPlayerByName(std::string const& name, bool checkInWorld = true); static std::map playerNameToPlayerPointer; // pussywizard: optimization