diff options
| -rw-r--r-- | src/server/game/Chat/Chat.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Handlers/CalendarHandler.cpp | 3 | ||||
| -rw-r--r-- | src/server/scripts/Commands/cs_ban.cpp | 14 |
3 files changed, 15 insertions, 4 deletions
diff --git a/src/server/game/Chat/Chat.cpp b/src/server/game/Chat/Chat.cpp index ead2eb05498..2e2336f63da 100644 --- a/src/server/game/Chat/Chat.cpp +++ b/src/server/game/Chat/Chat.cpp @@ -1146,7 +1146,7 @@ bool ChatHandler::GetPlayerGroupAndGUIDByName(const char* cname, Player*& player { if (!normalizePlayerName(name)) { - PSendSysMessage(LANG_PLAYER_NOT_FOUND); + SendSysMessage(LANG_PLAYER_NOT_FOUND); SetSentErrorMessage(true); return false; } diff --git a/src/server/game/Handlers/CalendarHandler.cpp b/src/server/game/Handlers/CalendarHandler.cpp index 82dedefb997..cbc8de2b294 100644 --- a/src/server/game/Handlers/CalendarHandler.cpp +++ b/src/server/game/Handlers/CalendarHandler.cpp @@ -246,6 +246,9 @@ void WorldSession::HandleCalendarEventInvite(WorldPackets::Calendar::CalendarEve uint32 inviteeTeam = 0; ObjectGuid::LowType inviteeGuildId = UI64LIT(0); + if (!normalizePlayerName(calendarEventInvite.Name)) + return; + if (Player* player = ObjectAccessor::FindConnectedPlayerByName(calendarEventInvite.Name)) { // Invitee is online diff --git a/src/server/scripts/Commands/cs_ban.cpp b/src/server/scripts/Commands/cs_ban.cpp index a2320449dcf..11d7002452d 100644 --- a/src/server/scripts/Commands/cs_ban.cpp +++ b/src/server/scripts/Commands/cs_ban.cpp @@ -300,16 +300,24 @@ public: if (!*args) return false; - Player* target = ObjectAccessor::FindPlayerByName(args); - ObjectGuid targetGuid; std::string name(args); + if (!normalizePlayerName(name)) + { + handler->SendSysMessage(LANG_BANINFO_NOCHARACTER); + handler->SetSentErrorMessage(true); + return false; + } + + Player* target = ObjectAccessor::FindPlayerByName(name); + ObjectGuid targetGuid; if (!target) { targetGuid = sWorld->GetCharacterGuidByName(name); if (targetGuid.IsEmpty()) { - handler->PSendSysMessage(LANG_BANINFO_NOCHARACTER); + handler->SendSysMessage(LANG_BANINFO_NOCHARACTER); + handler->SetSentErrorMessage(true); return false; } } |