From b984933841139e7ad4d10279640195fc1b886830 Mon Sep 17 00:00:00 2001 From: Machiavelli Date: Tue, 23 Dec 2008 11:00:11 +0100 Subject: [PATCH] *Fix issue where whispers gets allowed from players when a GM whispers another GM --HG-- branch : trunk --- src/game/Player.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/game/Player.cpp b/src/game/Player.cpp index d2d2bbafe4..4b187023be 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);