josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Misc: Fix some typos in af040fc18d

Browse Source
This commit is contained in:
tobmaps
2011-08-13 20:53:24 +07:00
parent af040fc18d
commit 54cf7f28d2
3 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Entities/Player/Player.cpp
+1 -1
View File
@@ -24664,7 +24664,7 @@ void Player::_SaveInstanceTimeRestrictions(SQLTransaction& trans)
} }
} }
bool Player::IsInWhipserWhiteList(uint64 guid) bool Player::IsInWhisperWhiteList(uint64 guid)
{ {
for (WhisperListContainer::const_iterator itr = WhisperList.begin(); itr != WhisperList.end(); ++itr) for (WhisperListContainer::const_iterator itr = WhisperList.begin(); itr != WhisperList.end(); ++itr)
{ {
src/server/game/Entities/Player/Player.h
+1 -1
View File
@@ -2471,7 +2471,7 @@ class Player : public Unit, public GridObject<Player>
void ClearWhisperWhiteList() { WhisperList.clear(); } void ClearWhisperWhiteList() { WhisperList.clear(); }
void AddWhisperWhiteList(uint64 guid) { WhisperList.push_back(guid); } void AddWhisperWhiteList(uint64 guid) { WhisperList.push_back(guid); }
bool IsInWhipserWhiteList(uint64 guid); bool IsInWhisperWhiteList(uint64 guid);
protected: protected:
// Gamemaster whisper whitelist // Gamemaster whisper whitelist
src/server/game/Server/Protocol/Handlers/ChatHandler.cpp
+5 -7
View File
@@ -267,7 +267,7 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket & recv_data)
Player* receiver = sObjectAccessor->FindPlayerByName(to.c_str()); Player* receiver = sObjectAccessor->FindPlayerByName(to.c_str());
uint32 senderSecurity = GetSecurity(); uint32 senderSecurity = GetSecurity();
uint32 receiverSecurity = receiver ? receiver->GetSession()->GetSecurity() : SEC_PLAYER; uint32 receiverSecurity = receiver ? receiver->GetSession()->GetSecurity() : SEC_PLAYER;
if (!receiver || (senderSecurity == SEC_PLAYER && receiverSecurity > SEC_PLAYER && !receiver->isAcceptWhispers() && !receiver->IsInWhipserWhiteList(sender->GetGUID()))) if (!receiver || (senderSecurity == SEC_PLAYER && receiverSecurity > SEC_PLAYER && !receiver->isAcceptWhispers() && !receiver->IsInWhisperWhiteList(sender->GetGUID())))
{ {
SendPlayerNotFoundNotice(to); SendPlayerNotFoundNotice(to);
return; return;
@@ -291,10 +291,8 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket & recv_data)
} }
// If player is a Gamemaster and doesn't accept whisper, we auto-whitelist every player that the Gamemaster is talking to // If player is a Gamemaster and doesn't accept whisper, we auto-whitelist every player that the Gamemaster is talking to
if (sender->GetSession()->GetSecurity() > SEC_PLAYER && !sender->isAcceptWhispers() && !sender->IsInWhipserWhiteList(receiver->GetGUID())) if (senderSecurity > SEC_PLAYER && !sender->isAcceptWhispers() && !sender->IsInWhisperWhiteList(receiver->GetGUID()))
{
sender->AddWhisperWhiteList(receiver->GetGUID()); sender->AddWhisperWhiteList(receiver->GetGUID());
}
GetPlayer()->Whisper(msg, lang, receiver->GetGUID()); GetPlayer()->Whisper(msg, lang, receiver->GetGUID());
} break; } break;
@@ -310,7 +308,7 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket & recv_data)
return; return;
} }
if ((type == CHAT_MSG_PARTY_LEADER) && !group->IsLeader(_player->GetGUID())) if (type == CHAT_MSG_PARTY_LEADER && !group->IsLeader(_player->GetGUID()))
return; return;
sScriptMgr->OnPlayerChat(GetPlayer(), type, lang, msg, group); sScriptMgr->OnPlayerChat(GetPlayer(), type, lang, msg, group);
@@ -427,7 +425,7 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket & recv_data)
if (ChannelMgr* cMgr = channelMgr(_player->GetTeam())) if (ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
{ {
if (Channel *chn = cMgr->GetChannel(channel, _player)) if (Channel* chn = cMgr->GetChannel(channel, _player))
{ {
sScriptMgr->OnPlayerChat(_player, type, lang, msg, chn); sScriptMgr->OnPlayerChat(_player, type, lang, msg, chn);
@@ -460,7 +458,7 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket & recv_data)
if (!_player->isDND()) if (!_player->isDND())
{ {
if (msg.empty()) if (msg.empty())
msg = GetTrinityString(LANG_PLAYER_DND_DEFAULT); msg = GetTrinityString(LANG_PLAYER_DND_DEFAULT);
_player->dndMsg = msg; _player->dndMsg = msg;
} }