aboutsummaryrefslogtreecommitdiff
path: root/src/server/game
diff options
context:
space:
mode:
authorPeter Keresztes Schmidt <carbenium@outlook.com>2020-09-10 13:10:01 +0200
committerGitHub <noreply@github.com>2020-09-10 13:10:01 +0200
commit8985fc4046e9a9b43d873e4d7b89a71afb910517 (patch)
tree91148b643416974c4823c11cb22044eb981db199 /src/server/game
parent0769d7726975a2fc848972a53f71efc4b6463e72 (diff)
Core/ChatCommands: Drop PlayerIdentifier's cast operators which could return nullptr (PR #25431)
Diffstat (limited to 'src/server/game')
-rw-r--r--src/server/game/Chat/ChatCommands/ChatCommandTags.h14
1 files changed, 5 insertions, 9 deletions
diff --git a/src/server/game/Chat/ChatCommands/ChatCommandTags.h b/src/server/game/Chat/ChatCommands/ChatCommandTags.h
index 50a0d82edf9..011782a41cc 100644
--- a/src/server/game/Chat/ChatCommands/ChatCommandTags.h
+++ b/src/server/game/Chat/ChatCommands/ChatCommandTags.h
@@ -149,15 +149,11 @@ namespace Trinity::ChatCommands
PlayerIdentifier() : _name(), _guid(), _player(nullptr) {}
PlayerIdentifier(Player& player);
- template <typename T>
- operator std::enable_if_t<std::is_base_of_v<T, Player>, T*>() const { return static_cast<T*>(_player); }
- operator value_type() const { return _player; }
- operator ObjectGuid() { return _guid; }
- Player* operator->() const { return _player; }
- explicit operator bool() const { return (_player != nullptr); }
- bool operator!() const { return (_player == nullptr); }
-
- std::string const& GetName() { return _name; }
+ operator ObjectGuid() const { return _guid; }
+ operator std::string const&() const { return _name; }
+ operator std::string_view() const { return _name; }
+
+ std::string const& GetName() const { return _name; }
ObjectGuid GetGUID() const { return _guid; }
bool IsConnected() const { return (_player != nullptr); }
Player* GetConnectedPlayer() const { return _player; }