From 93b5ccd4548b3595dfd78df7b91bef0f27f0faf5 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Sat, 4 Jun 2022 10:23:54 -0400 Subject: [PATCH] Scripts/Commands: Convert argument parsing of event commands to new system Port From (https://github.com/TrinityCore/TrinityCore/commit/86bfde389a73c984c7ce15ad736c998e893fda6d) --- Source/Game/Chat/Commands/EventCommands.cs | 41 +++------------------- 1 file changed, 4 insertions(+), 37 deletions(-) diff --git a/Source/Game/Chat/Commands/EventCommands.cs b/Source/Game/Chat/Commands/EventCommands.cs index f934d295e..7c5b327ee 100644 --- a/Source/Game/Chat/Commands/EventCommands.cs +++ b/Source/Game/Chat/Commands/EventCommands.cs @@ -24,19 +24,8 @@ namespace Game.Chat class EventCommands { [Command("info", RBACPermissions.CommandEvent, true)] - static bool HandleEventInfoCommand(CommandHandler handler, StringArguments args) + static bool HandleEventInfoCommand(CommandHandler handler, ushort eventId) { - if (args.Empty()) - return false; - - // id or [name] Shift-click form |color|Hgameevent:id|h[name]|h|r - string id = handler.ExtractKeyFromLink(args, "Hgameevent"); - if (string.IsNullOrEmpty(id)) - return false; - - if (!ushort.TryParse(id, out ushort eventId)) - return false; - var events = Global.GameEventMgr.GetEventMap(); if (eventId >= events.Length) { @@ -71,7 +60,7 @@ namespace Game.Chat } [Command("activelist", RBACPermissions.CommandEventActivelist, true)] - static bool HandleEventActiveListCommand(CommandHandler handler, StringArguments args) + static bool HandleEventActiveListCommand(CommandHandler handler) { uint counter = 0; @@ -99,19 +88,8 @@ namespace Game.Chat } [Command("start", RBACPermissions.CommandEventStart, true)] - static bool HandleEventStartCommand(CommandHandler handler, StringArguments args) + static bool HandleEventStartCommand(CommandHandler handler, ushort eventId) { - if (args.Empty()) - return false; - - // id or [name] Shift-click form |color|Hgameevent:id|h[name]|h|r - string id = handler.ExtractKeyFromLink(args, "Hgameevent"); - if (string.IsNullOrEmpty(id)) - return false; - - if (!ushort.TryParse(id, out ushort eventId)) - return false; - var events = Global.GameEventMgr.GetEventMap(); if (eventId < 1 || eventId >= events.Length) { @@ -138,19 +116,8 @@ namespace Game.Chat } [Command("stop", RBACPermissions.CommandEventStop, true)] - static bool HandleEventStopCommand(CommandHandler handler, StringArguments args) + static bool HandleEventStopCommand(CommandHandler handler, ushort eventId) { - if (args.Empty()) - return false; - - // id or [name] Shift-click form |color|Hgameevent:id|h[name]|h|r - string id = handler.ExtractKeyFromLink(args, "Hgameevent"); - if (string.IsNullOrEmpty(id)) - return false; - - if (!ushort.TryParse(id, out ushort eventId)) - return false; - var events = Global.GameEventMgr.GetEventMap(); if (eventId < 1 || eventId >= events.Length) {