aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/game/Level1.cpp2
-rw-r--r--src/game/Level2.cpp7
2 files changed, 5 insertions, 4 deletions
diff --git a/src/game/Level1.cpp b/src/game/Level1.cpp
index 0317a6c3e22..9ec47381f61 100644
--- a/src/game/Level1.cpp
+++ b/src/game/Level1.cpp
@@ -846,7 +846,7 @@ bool ChatHandler::HandleNamegoCommand(const char* args)
PSendSysMessage(LANG_SUMMONING, nameLink.c_str(),"");
if (needReportToTarget(target))
- ChatHandler(target).PSendSysMessage(LANG_SUMMONED_BY, nameLink.c_str());
+ ChatHandler(target).PSendSysMessage(LANG_SUMMONED_BY, _player->GetName());
// stop flight if need
if (target->isInFlight())
diff --git a/src/game/Level2.cpp b/src/game/Level2.cpp
index ec38b3c57ac..22abf591f05 100644
--- a/src/game/Level2.cpp
+++ b/src/game/Level2.cpp
@@ -66,9 +66,10 @@ bool ChatHandler::HandleMuteCommand(const char* args)
return false;
uint32 account_id = target ? target->GetSession()->GetAccountId() : objmgr.GetPlayerAccountIdByGUID(target_guid);
+ std::string mutereasonstr;
char *mutereason = strtok(NULL, " ");
if(!mutereason)
- strcpy(mutereason, "No reason.");
+ mutereason = mutereason;
// find only player from same account if any
if(!target)
@@ -91,11 +92,11 @@ bool ChatHandler::HandleMuteCommand(const char* args)
LoginDatabase.PExecute("UPDATE account SET mutetime = " UI64FMTD " WHERE id = '%u'",uint64(mutetime), account_id );
if(target)
- ChatHandler(target).PSendSysMessage(LANG_YOUR_CHAT_DISABLED, notspeaktime, mutereason);
+ ChatHandler(target).PSendSysMessage(LANG_YOUR_CHAT_DISABLED, notspeaktime, mutereasonstr.c_str());
std::string nameLink = playerLink(target_name);
- PSendSysMessage(LANG_YOU_DISABLE_CHAT, nameLink, notspeaktime, mutereason);
+ PSendSysMessage(LANG_YOU_DISABLE_CHAT, nameLink, notspeaktime, mutereasonstr.c_str());
return true;
}