From 10525d2a5cf24245a633dc35b8f8793da37fd1b1 Mon Sep 17 00:00:00 2001 From: yoyosource Date: Thu, 16 Jun 2022 17:28:14 +0200 Subject: [PATCH] Fix stuff --- src/de/steamwar/command/CommandPart.java | 24 ------------------------ src/de/steamwar/command/SubCommand.java | 1 - 2 files changed, 25 deletions(-) diff --git a/src/de/steamwar/command/CommandPart.java b/src/de/steamwar/command/CommandPart.java index 1072c2a..2f7e075 100644 --- a/src/de/steamwar/command/CommandPart.java +++ b/src/de/steamwar/command/CommandPart.java @@ -123,30 +123,6 @@ class CommandPart { } } - public boolean validate(T sender, List values, int startIndex) { - if (varArgType != null) { - for (int i = startIndex; i < values.size(); i++) { - Object value = values.get(i); - if (validator != null && !validator.validate(sender, value, (s, objects) -> command.sendMessage(sender, s, objects))) { - return false; - } - } - return true; - } - - Object value = values.get(startIndex); - if (validator != null && !validator.validate(sender, value, (s, objects) -> command.sendMessage(sender, s, objects))) { - if (optional != null && next != null) { - return next.validate(sender, values, startIndex); - } - return false; - } - if (next != null) { - return next.validate(sender, values, startIndex + 1); - } - return true; - } - public boolean guardCheck(T sender, String[] args, int startIndex) { if (varArgType != null) { for (int i = startIndex; i < args.length; i++) { diff --git a/src/de/steamwar/command/SubCommand.java b/src/de/steamwar/command/SubCommand.java index f8e7014..d3a266c 100644 --- a/src/de/steamwar/command/SubCommand.java +++ b/src/de/steamwar/command/SubCommand.java @@ -114,7 +114,6 @@ public class SubCommand { return true; } } - commandPart.validate(sender, objects, 0); commandPart.guardCheck(sender, args, 0); objects.add(0, senderFunction.apply(sender)); method.setAccessible(true);