Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
Conflicts: src/server/game/Battlegrounds/ArenaTeamMgr.cpp src/server/game/Handlers/GroupHandler.cpp
This commit is contained in:
commit
c238e8faff
17 files changed
+43
-43
No files matched your search
@@ -326,7 +326,7 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recvData)
|
||||
break;
|
||||
}
|
||||
|
||||
Player* receiver = sObjectAccessor->FindConnectedPlayerByName(to);
|
||||
Player* receiver = ObjectAccessor::FindConnectedPlayerByName(to);
|
||||
if (!receiver || (lang != LANG_ADDON && !receiver->isAcceptWhispers() && receiver->GetSession()->HasPermission(rbac::RBAC_PERM_CAN_FILTER_WHISPERS) && !receiver->IsInWhisperWhiteList(sender->GetGUID())))
|
||||
{
|
||||
SendPlayerNotFoundNotice(to);
|
||||
|
||||
Reference in new issue
Block a user