Scripts/Commands: Convert argument parsing of deserter commands to new system

Port From (https://github.com/TrinityCore/TrinityCore/commit/dc5f7ee5fc0a475f7a1ac1029cd7352dcc376c20)
This commit is contained in:
hondacrx
2022-06-03 22:38:22 -04:00
parent 5f16cea602
commit 038fd90903
+10 -19
View File
@@ -35,15 +35,15 @@ namespace Game.Chat.Commands
class DeserterInstanceCommands class DeserterInstanceCommands
{ {
[Command("add", RBACPermissions.CommandDeserterInstanceAdd)] [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)] [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 class DeserterBGCommands
{ {
[Command("add", RBACPermissions.CommandDeserterBgAdd)] [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)] [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(); Player player = handler.GetSelectedPlayer();
if (!player) if (!player)
{ {
@@ -75,12 +72,6 @@ namespace Game.Chat.Commands
return false; 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); Aura aura = player.AddAura(isInstance ? Spells.LFGDundeonDeserter : Spells.BGDeserter, player);
if (aura == null) if (aura == null)
{ {
@@ -92,7 +83,7 @@ namespace Game.Chat.Commands
return true; return true;
} }
static bool HandleDeserterRemove(StringArguments args, CommandHandler handler, bool isInstance) static bool HandleDeserterRemove(CommandHandler handler, bool isInstance)
{ {
Player player = handler.GetSelectedPlayer(); Player player = handler.GetSelectedPlayer();
if (!player) if (!player)