diff options
| author | Treeston <treeston.mmoc@gmail.com> | 2020-09-09 20:38:04 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-02-05 19:20:18 +0100 |
| commit | b6635be04184cdea0e3ed269cc1687f72c3dc5a9 (patch) | |
| tree | d66809191630116aed2afb507b9e8949d7366492 /src/server/game/Server | |
| parent | 42be7836dfacd9e8d6b0c2b5d5f230ed6a55f088 (diff) | |
[3.3.5] Core/Guilds: Guild cleanup (PR #25422)
(cherry picked from commit cd28423a4e813baf6833f38c93613a7f82a721f8)
Diffstat (limited to 'src/server/game/Server')
| -rw-r--r-- | src/server/game/Server/Packets/PacketUtilities.h | 2 | ||||
| -rw-r--r-- | src/server/game/Server/WorldSession.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Server/WorldSession.h | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/server/game/Server/Packets/PacketUtilities.h b/src/server/game/Server/Packets/PacketUtilities.h index 3be2bf786a9..a4ecc96c08c 100644 --- a/src/server/game/Server/Packets/PacketUtilities.h +++ b/src/server/game/Server/Packets/PacketUtilities.h @@ -22,6 +22,7 @@ #include "Duration.h" #include "Tuples.h" #include <boost/container/static_vector.hpp> +#include <string_view> #include <ctime> namespace WorldPackets @@ -79,6 +80,7 @@ namespace WorldPackets bool empty() const { return _storage.empty(); } char const* c_str() const { return _storage.c_str(); } + operator std::string_view() const { return _storage; } operator std::string&() { return _storage; } operator std::string const&() const { return _storage; } diff --git a/src/server/game/Server/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp index 8e58a700c6c..0e14b0afc49 100644 --- a/src/server/game/Server/WorldSession.cpp +++ b/src/server/game/Server/WorldSession.cpp @@ -931,7 +931,7 @@ void WorldSession::SaveTutorialsData(CharacterDatabaseTransaction& trans) _tutorialsChanged &= ~TUTORIALS_FLAG_CHANGED; } -bool WorldSession::IsAddonRegistered(const std::string& prefix) const +bool WorldSession::IsAddonRegistered(std::string_view prefix) const { if (!_filterAddonMessages) // if we have hit the softcap (64) nothing should be filtered return true; diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h index 89f0038d6fc..b71a6a193d3 100644 --- a/src/server/game/Server/WorldSession.h +++ b/src/server/game/Server/WorldSession.h @@ -962,7 +962,7 @@ class TC_GAME_API WorldSession bool PlayerRecentlyLoggedOut() const { return m_playerRecentlyLogout; } bool PlayerDisconnected() const; - bool IsAddonRegistered(const std::string& prefix) const; + bool IsAddonRegistered(std::string_view prefix) const; void SendPacket(WorldPacket const* packet, bool forced = false); void AddInstanceConnection(std::shared_ptr<WorldSocket> sock) { m_Socket[CONNECTION_TYPE_INSTANCE] = sock; } |