diff options
Diffstat (limited to 'src')
| -rwxr-xr-x | src/server/game/Chat/Chat.cpp | 4 | ||||
| -rwxr-xr-x | src/server/game/Chat/Commands/Level1.cpp | 18 | ||||
| -rwxr-xr-x | src/server/game/World/World.cpp | 2 |
3 files changed, 14 insertions, 10 deletions
diff --git a/src/server/game/Chat/Chat.cpp b/src/server/game/Chat/Chat.cpp index 32da0947aff..ff6c16ec554 100755 --- a/src/server/game/Chat/Chat.cpp +++ b/src/server/game/Chat/Chat.cpp @@ -347,8 +347,8 @@ ChatCommand * ChatHandler::getCommandTable() { "aura", SEC_ADMINISTRATOR, false, OldHandler<&ChatHandler::HandleAuraCommand>, "", NULL }, { "unaura", SEC_ADMINISTRATOR, false, OldHandler<&ChatHandler::HandleUnAuraCommand>, "", NULL }, - { "nameannounce", SEC_MODERATOR, false, OldHandler<&ChatHandler::HandleNameAnnounceCommand>, "", NULL }, - { "gmnameannounce", SEC_MODERATOR, false, OldHandler<&ChatHandler::HandleGMNameAnnounceCommand>, "", NULL }, + { "nameannounce", SEC_MODERATOR, true, OldHandler<&ChatHandler::HandleNameAnnounceCommand>, "", NULL }, + { "gmnameannounce", SEC_MODERATOR, true, OldHandler<&ChatHandler::HandleGMNameAnnounceCommand>, "", NULL }, { "announce", SEC_MODERATOR, true, OldHandler<&ChatHandler::HandleAnnounceCommand>, "", NULL }, { "gmannounce", SEC_MODERATOR, true, OldHandler<&ChatHandler::HandleGMAnnounceCommand>, "", NULL }, { "notify", SEC_MODERATOR, true, OldHandler<&ChatHandler::HandleNotifyCommand>, "", NULL }, diff --git a/src/server/game/Chat/Commands/Level1.cpp b/src/server/game/Chat/Commands/Level1.cpp index 8b234aa3921..71b915f9d53 100755 --- a/src/server/game/Chat/Commands/Level1.cpp +++ b/src/server/game/Chat/Commands/Level1.cpp @@ -46,7 +46,11 @@ bool ChatHandler::HandleNameAnnounceCommand(const char* args) if (!*args) return false; - sWorld->SendWorldText(LANG_ANNOUNCE_COLOR, m_session->GetPlayer()->GetName(), args); + std::string name("Console"); + if (WorldSession* session = GetSession()) + name = session->GetPlayer()->GetName(); + + sWorld->SendWorldText(LANG_ANNOUNCE_COLOR, name.c_str(), args); return true; } @@ -56,7 +60,11 @@ bool ChatHandler::HandleGMNameAnnounceCommand(const char* args) if (!*args) return false; - sWorld->SendGMText(LANG_GM_ANNOUNCE_COLOR, m_session->GetPlayer()->GetName(), args); + std::string name("Console"); + if (WorldSession* session = GetSession()) + name = session->GetPlayer()->GetName(); + + sWorld->SendGMText(LANG_GM_ANNOUNCE_COLOR, name.c_str(), args); return true; } @@ -78,11 +86,7 @@ bool ChatHandler::HandleGMAnnounceCommand(const char* args) if (!*args) return false; - std::string name("Console"); - if (Player* _player = m_session->GetPlayer()) - name = _player->GetName(); - - sWorld->SendGMText(LANG_GM_BROADCAST, name.c_str(), args); + sWorld->SendGMText(LANG_GM_BROADCAST, args); return true; } diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index 143c1cc3480..0c2703edd41 100755 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -2538,7 +2538,7 @@ void World::ProcessCliCommands() callbackArg = command->m_callbackArg; CliHandler handler(callbackArg, zprint); handler.ParseCommands(command->m_command); - if(command->m_commandFinished) + if (command->m_commandFinished) command->m_commandFinished(callbackArg, !handler.HasSentErrorMessage()); delete command; } |