aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMachiavelli <none@none>2008-12-23 11:00:11 +0100
committerMachiavelli <none@none>2008-12-23 11:00:11 +0100
commitb984933841139e7ad4d10279640195fc1b886830 (patch)
tree0c8fbea4fa723b3e6666c33b5f4d3053b3b7b667 /src
parentcce6986e4fcf0d6463c71d6a3aad4137d39004ee (diff)
*Fix issue where whispers gets allowed from players when a GM whispers another GM
--HG-- branch : trunk
Diffstat (limited to 'src')
-rw-r--r--src/game/Player.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index d2d2bbafe4e..4b187023be4 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -16317,7 +16317,7 @@ void Player::Whisper(const std::string& text, uint32 language,uint64 receiver)
ChatHandler(this).PSendSysMessage(LANG_PLAYER_DND, rPlayer->GetName(), rPlayer->dndMsg.c_str());
}
- if(!isAcceptWhispers())
+ if(!isAcceptWhispers() && !isGameMaster() && !rPlayer->isGameMaster())
{
SetAcceptWhispers(true);
ChatHandler(this).SendSysMessage(LANG_COMMAND_WHISPERON);