From 038fd90903bc56a66fe8b4e6e60df9f322739d76 Mon Sep 17 00:00:00 2001
From: hondacrx <prelude_20032002@yahoo.com>
Date: Fri, 3 Jun 2022 22:38:22 -0400
Subject: [PATCH] Scripts/Commands: Convert argument parsing of deserter
 commands to new system

Port From (https://github.com/TrinityCore/TrinityCore/commit/dc5f7ee5fc0a475f7a1ac1029cd7352dcc376c20)
---
 Source/Game/Chat/Commands/DeserterCommands.cs | 29 +++++++------------
 1 file changed, 10 insertions(+), 19 deletions(-)

diff --git a/Source/Game/Chat/Commands/DeserterCommands.cs b/Source/Game/Chat/Commands/DeserterCommands.cs
index 8287edb8a..3b776b140 100644
--- a/Source/Game/Chat/Commands/DeserterCommands.cs
+++ b/Source/Game/Chat/Commands/DeserterCommands.cs
@@ -35,15 +35,15 @@ namespace Game.Chat.Commands
         class DeserterInstanceCommands
         {
             [Command("add", RBACPermissions.CommandDeserterInstanceAdd)]
-            static bool HandleDeserterInstanceAdd(CommandHandler handler, StringArguments args)
+            static bool HandleDeserterInstanceAdd(CommandHandler handler, uint time)
             {
-                return HandleDeserterAdd(args, handler, true);
+                return HandleDeserterAdd(handler, time, true);
             }
 
             [Command("remove", RBACPermissions.CommandDeserterInstanceRemove)]
-            static bool HandleDeserterInstanceRemove(CommandHandler handler, StringArguments args)
+            static bool HandleDeserterInstanceRemove(CommandHandler handler)
             {
-                return HandleDeserterRemove(args, handler, true);
+                return HandleDeserterRemove(handler, true);
             }
         }
 
@@ -51,23 +51,20 @@ namespace Game.Chat.Commands
         class DeserterBGCommands
         {
             [Command("add", RBACPermissions.CommandDeserterBgAdd)]
-            static bool HandleDeserterBGAdd(CommandHandler handler, StringArguments args)
+            static bool HandleDeserterBGAdd(CommandHandler handler, uint time)
             {
-                return HandleDeserterAdd(args, handler, false);
+                return HandleDeserterAdd(handler, time, false);
             }
 
             [Command("remove", RBACPermissions.CommandDeserterBgRemove)]
-            static bool HandleDeserterBGRemove(CommandHandler handler, StringArguments args)
+            static bool HandleDeserterBGRemove(CommandHandler handler)
             {
-                return HandleDeserterRemove(args, handler, false);
+                return HandleDeserterRemove(handler, false);
             }
         }
 
-        static bool HandleDeserterAdd(StringArguments args, CommandHandler handler, bool isInstance)
+        static bool HandleDeserterAdd(CommandHandler handler, uint time, bool isInstance)
         {
-            if (args.Empty())
-                return false;
-
             Player player = handler.GetSelectedPlayer();
             if (!player)
             {
@@ -75,12 +72,6 @@ namespace Game.Chat.Commands
                 return false;
             }
 
-            if (!uint.TryParse(args.NextString(), out uint time) || time == 0)
-            {
-                handler.SendSysMessage(CypherStrings.BadValue);
-                return false;
-            }
-
             Aura aura = player.AddAura(isInstance ? Spells.LFGDundeonDeserter : Spells.BGDeserter, player);
             if (aura == null)
             {
@@ -92,7 +83,7 @@ namespace Game.Chat.Commands
             return true;
         }
 
-        static bool HandleDeserterRemove(StringArguments args, CommandHandler handler, bool isInstance)
+        static bool HandleDeserterRemove(CommandHandler handler, bool isInstance)
         {
             Player player = handler.GetSelectedPlayer();
             if (!player)