From 52de393f10dae4b21b84bd02aadf929b2283d8fe Mon Sep 17 00:00:00 2001 From: Shauren Date: Wed, 11 Apr 2018 00:05:59 +0200 Subject: Core/Players: Greatly simplifiy fdb2b90685ebc3852740c424170101a196c29ebb (cherry picked from commit 9617778336556cd9b19c77e037fb64344021d9cc) --- src/server/game/Cache/CharacterCache.cpp | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'src/server/game/Cache/CharacterCache.cpp') diff --git a/src/server/game/Cache/CharacterCache.cpp b/src/server/game/Cache/CharacterCache.cpp index 27b5dab47b6..a078c502e40 100644 --- a/src/server/game/Cache/CharacterCache.cpp +++ b/src/server/game/Cache/CharacterCache.cpp @@ -30,7 +30,6 @@ namespace { std::unordered_map _characterCacheStore; std::unordered_map _characterCacheByNameStore; - std::unordered_set _characterCreationNameStore; } CharacterCache::CharacterCache() @@ -226,21 +225,6 @@ CharacterCacheEntry const* CharacterCache::GetCharacterCacheByName(std::string c return nullptr; } -std::shared_ptr CharacterCache::TryCreateCharacterWithName(std::string const& name) const -{ - auto itr = _characterCacheByNameStore.find(name); - if (itr != _characterCacheByNameStore.end()) - return nullptr; - - auto insertResult = _characterCreationNameStore.insert(name); - if (!insertResult.second) - return nullptr; - - // shared_ptr with custom deleter that erases its held value from _characterCreationNameStore instead of deleting it (points to value inside the container) - return std::shared_ptr(&(*insertResult.first), - [this](std::string const* storedName) { _characterCreationNameStore.erase(*storedName); }); -} - ObjectGuid CharacterCache::GetCharacterGuidByName(std::string const& name) const { auto itr = _characterCacheByNameStore.find(name); -- cgit v1.2.3