diff options
-rw-r--r-- | sql/updates/4003_world_script_waypoint.sql (renamed from sql/updates/4003_world_scritp_waypoint.sql) | 0 | ||||
-rw-r--r-- | src/game/Level2.cpp | 11 |
2 files changed, 6 insertions, 5 deletions
diff --git a/sql/updates/4003_world_scritp_waypoint.sql b/sql/updates/4003_world_script_waypoint.sql index 603115f72c0..603115f72c0 100644 --- a/sql/updates/4003_world_scritp_waypoint.sql +++ b/sql/updates/4003_world_script_waypoint.sql diff --git a/src/game/Level2.cpp b/src/game/Level2.cpp index 901c9ba1d1c..fc7dc8b1618 100644 --- a/src/game/Level2.cpp +++ b/src/game/Level2.cpp @@ -59,6 +59,11 @@ bool ChatHandler::HandleMuteCommand(const char* args) if(!delayStr) return false; + char *mutereason = strtok(NULL, "\r"); + std::string mutereasonstr = "No reason"; + if(mutereason != NULL) + mutereasonstr = mutereason; + Player* target; uint64 target_guid; std::string target_name; @@ -66,10 +71,6 @@ bool ChatHandler::HandleMuteCommand(const char* args) return false; uint32 account_id = target ? target->GetSession()->GetAccountId() : objmgr.GetPlayerAccountIdByGUID(target_guid); - std::string mutereasonstr = "No reason."; - char *mutereason = strtok(NULL, " "); - if(mutereason) - mutereason = mutereason; // find only player from same account if any if(!target) @@ -96,7 +97,7 @@ bool ChatHandler::HandleMuteCommand(const char* args) std::string nameLink = playerLink(target_name); - PSendSysMessage(LANG_YOU_DISABLE_CHAT, nameLink, notspeaktime, mutereasonstr.c_str()); + PSendSysMessage(LANG_YOU_DISABLE_CHAT, nameLink.c_str(), notspeaktime, mutereasonstr.c_str()); return true; } |