From ffede34ba9a33364a34932487c3024e6e67935d1 Mon Sep 17 00:00:00 2001 From: ForesterDev <11771800+ForesterDev@users.noreply.github.com> Date: Fri, 28 Feb 2020 22:53:35 +0400 Subject: 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 --- src/server/scripts/Commands/cs_misc.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/server/scripts/Commands') diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp index 5ce2612aa5a..acf3f5ce92c 100644 --- a/src/server/scripts/Commands/cs_misc.cpp +++ b/src/server/scripts/Commands/cs_misc.cpp @@ -2036,7 +2036,7 @@ public: if (target) { - if (target->CanSpeak()) + if (target->GetSession()->CanSpeak()) { handler->SendSysMessage(LANG_CHAT_ALREADY_ENABLED); handler->SetSentErrorMessage(true); -- cgit v1.2.3