From df61f03a9898be67081c9575370037d6317ca358 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Thu, 15 Aug 2019 14:53:54 -0400 Subject: [PATCH] Core: add some missing Player Name normalization on input data Port From (https://github.com/TrinityCore/TrinityCore/commit/b742c872223950dfae14468b0e7a304a3e660e76) --- Source/Game/Chat/Commands/BanCommands.cs | 6 ++++++ Source/Game/Handlers/CalendarHandler.cs | 3 +++ 2 files changed, 9 insertions(+) diff --git a/Source/Game/Chat/Commands/BanCommands.cs b/Source/Game/Chat/Commands/BanCommands.cs index 6ad8e1608..a3cb1ebcc 100644 --- a/Source/Game/Chat/Commands/BanCommands.cs +++ b/Source/Game/Chat/Commands/BanCommands.cs @@ -213,6 +213,12 @@ namespace Game.Chat.Commands return false; string name = args.NextString(); + if (!ObjectManager.NormalizePlayerName(ref name)) + { + handler.SendSysMessage(CypherStrings.BaninfoNocharacter); + return false; + } + Player target = Global.ObjAccessor.FindPlayerByName(name); ObjectGuid targetGuid; diff --git a/Source/Game/Handlers/CalendarHandler.cs b/Source/Game/Handlers/CalendarHandler.cs index 29bfb1dd1..1ebedefc5 100644 --- a/Source/Game/Handlers/CalendarHandler.cs +++ b/Source/Game/Handlers/CalendarHandler.cs @@ -241,6 +241,9 @@ namespace Game Team inviteeTeam = 0; ulong inviteeGuildId = 0; + if (!ObjectManager.NormalizePlayerName(ref calendarEventInvite.Name)) + return; + Player player = Global.ObjAccessor.FindPlayerByName(calendarEventInvite.Name); if (player) {