diff options
| author | ForesterDev <11771800+ForesterDev@users.noreply.github.com> | 2020-02-28 22:53:35 +0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-28 19:53:35 +0100 |
| commit | ffede34ba9a33364a34932487c3024e6e67935d1 (patch) | |
| tree | c7eb8e57c8ed28b10b57c332b4797b304cdf4a64 /src/server/game/Handlers/ChatHandler.cpp | |
| parent | c0676a48f70923994e00629d775f4bfef1007155 (diff) | |
Core/Misc: Moved CanSpeak() method to WorldSession class (#24209)
* Core/Misc: Moved CanSpeak() method to WorldSession class
(cherry picked from commit 93aa30f4474254b9db69025e7864a124028273c0)
# Conflicts:
# src/server/game/Entities/Player/Player.cpp
# src/server/game/Handlers/ChatHandler.cpp
# src/server/game/Server/WorldSession.cpp
* fix merge conflicts
Diffstat (limited to 'src/server/game/Handlers/ChatHandler.cpp')
| -rw-r--r-- | src/server/game/Handlers/ChatHandler.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Handlers/ChatHandler.cpp b/src/server/game/Handlers/ChatHandler.cpp index cb3cb3e33a4..feb93f62039 100644 --- a/src/server/game/Handlers/ChatHandler.cpp +++ b/src/server/game/Handlers/ChatHandler.cpp @@ -171,7 +171,7 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recvData) } } - if (!sender->CanSpeak()) + if (!CanSpeak()) { std::string timeStr = secsToTimeString(m_muteTime - GameTime::GetGameTime()); SendNotification(GetTrinityString(LANG_WAIT_BEFORE_SPEAKING), timeStr.c_str()); @@ -621,7 +621,7 @@ void WorldSession::HandleTextEmoteOpcode(WorldPacket& recvData) if (!GetPlayer()->IsAlive()) return; - if (!GetPlayer()->CanSpeak()) + if (!CanSpeak()) { std::string timeStr = secsToTimeString(m_muteTime - GameTime::GetGameTime()); SendNotification(GetTrinityString(LANG_WAIT_BEFORE_SPEAKING), timeStr.c_str()); |