mirror of
https://github.com/TrinityCore/TrinityCore.git
synced 2026-01-15 23:20:36 +01:00
Core: add some missing Player Name normalization on input data
(cherrypicked from 6f9e8b6c91)
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user