diff --git a/docs/acf-core/co/aikar/commands/CommandConditions.Condition.html b/docs/acf-core/co/aikar/commands/CommandConditions.Condition.html
index 86524d76..c9cc6583 100644
--- a/docs/acf-core/co/aikar/commands/CommandConditions.Condition.html
+++ b/docs/acf-core/co/aikar/commands/CommandConditions.Condition.html
@@ -104,7 +104,7 @@ var activeTableTab = "activeTableTab";
-public static interface CommandConditions.Condition<I extends CommandIssuer>
+public static interface CommandConditions.Condition<I extends CommandIssuer>
@@ -124,7 +124,7 @@ var activeTableTab = "activeTableTab";
Method and Description |
-boolean |
+void |
validateCondition(ConditionContext<I> context) |
@@ -148,8 +148,8 @@ var activeTableTab = "activeTableTab";
@@ -124,7 +124,7 @@ var activeTableTab = "activeTableTab";
Method and Description |
-boolean |
+void |
validateCondition(ConditionContext<I> context,
CEC execContext,
P value) |
@@ -152,10 +152,10 @@ var activeTableTab = "activeTableTab";
-boolean |
+void |
CommandConditions.Condition.validateCondition(ConditionContext<I> context) |
-boolean |
+void |
CommandConditions.ParameterCondition.validateCondition(ConditionContext<I> context,
CEC execContext,
P value) |
diff --git a/docs/acf-core/co/aikar/commands/class-use/InvalidCommandArgument.html b/docs/acf-core/co/aikar/commands/class-use/InvalidCommandArgument.html
index 0d374aed..93938456 100644
--- a/docs/acf-core/co/aikar/commands/class-use/InvalidCommandArgument.html
+++ b/docs/acf-core/co/aikar/commands/class-use/InvalidCommandArgument.html
@@ -132,11 +132,11 @@
Integer paramIdx)
-boolean |
+void |
CommandConditions.Condition.validateCondition(ConditionContext<I> context) |
-boolean |
+void |
CommandConditions.ParameterCondition.validateCondition(ConditionContext<I> context,
CEC execContext,
P value) |
diff --git a/docs/acf-core/src-html/co/aikar/commands/CommandConditions.Condition.html b/docs/acf-core/src-html/co/aikar/commands/CommandConditions.Condition.html
index 2c441bf8..289a3b0c 100644
--- a/docs/acf-core/src-html/co/aikar/commands/CommandConditions.Condition.html
+++ b/docs/acf-core/src-html/co/aikar/commands/CommandConditions.Condition.html
@@ -105,57 +105,53 @@
097 //noinspection unchecked
098 CC conditionContext = (CC) this.manager.createConditionContext(issuer, config);
099 //noinspection unchecked
-100 if (!condition.validateCondition(conditionContext)) {
-101 return;
-102 }
-103 }
-104 }
-105
-106 private void validateConditions(Conditions condAnno, CEC execContext, Object value) throws InvalidCommandArgument {
-107 if (condAnno == null) {
-108 return;
-109 }
-110 String conditions = this.manager.getCommandReplacements().replace(condAnno.value());
-111 I issuer = execContext.getIssuer();
-112 for (String cond : ACFPatterns.PIPE.split(conditions)) {
-113 String[] split = ACFPatterns.COLON.split(cond, 2);
-114 ParameterCondition condition;
-115 Class<?> cls = execContext.getParam().getType();
-116 String id = split[0].toLowerCase();
-117 do {
-118 condition = this.paramConditions.get(cls, id);
-119 if (condition == null && cls.getSuperclass() != null && cls.getSuperclass() != Object.class) {
-120 cls = cls.getSuperclass();
-121 } else {
-122 break;
-123 }
-124 } while (cls != null);
-125
-126
-127 if (condition == null) {
-128 RegisteredCommand cmd = execContext.getCmd();
-129 this.manager.log(LogLevel.ERROR, "Could not find command condition " + id + " for " + cmd.method.getName() + "::" +execContext.getParam().getName());
-130 continue;
-131 }
-132 String config = split.length == 2 ? split[1] : null;
-133 //noinspection unchecked
-134 CC conditionContext = (CC) this.manager.createConditionContext(issuer, config);
-135
-136 //noinspection unchecked
-137 if (!condition.validateCondition(conditionContext, execContext, value)) {
-138 return;
-139 }
-140 }
+100 condition.validateCondition(conditionContext);
+101 }
+102 }
+103
+104 private void validateConditions(Conditions condAnno, CEC execContext, Object value) throws InvalidCommandArgument {
+105 if (condAnno == null) {
+106 return;
+107 }
+108 String conditions = this.manager.getCommandReplacements().replace(condAnno.value());
+109 I issuer = execContext.getIssuer();
+110 for (String cond : ACFPatterns.PIPE.split(conditions)) {
+111 String[] split = ACFPatterns.COLON.split(cond, 2);
+112 ParameterCondition condition;
+113 Class<?> cls = execContext.getParam().getType();
+114 String id = split[0].toLowerCase();
+115 do {
+116 condition = this.paramConditions.get(cls, id);
+117 if (condition == null && cls.getSuperclass() != null && cls.getSuperclass() != Object.class) {
+118 cls = cls.getSuperclass();
+119 } else {
+120 break;
+121 }
+122 } while (cls != null);
+123
+124
+125 if (condition == null) {
+126 RegisteredCommand cmd = execContext.getCmd();
+127 this.manager.log(LogLevel.ERROR, "Could not find command condition " + id + " for " + cmd.method.getName() + "::" +execContext.getParam().getName());
+128 continue;
+129 }
+130 String config = split.length == 2 ? split[1] : null;
+131 //noinspection unchecked
+132 CC conditionContext = (CC) this.manager.createConditionContext(issuer, config);
+133
+134 //noinspection unchecked
+135 condition.validateCondition(conditionContext, execContext, value);
+136 }
+137 }
+138
+139 public interface Condition <I extends CommandIssuer> {
+140 void validateCondition(ConditionContext<I> context) throws InvalidCommandArgument;
141 }
142
-143 public interface Condition <I extends CommandIssuer> {
-144 boolean validateCondition(ConditionContext<I> context) throws InvalidCommandArgument;
+143 public interface ParameterCondition <P, CEC extends CommandExecutionContext, I extends CommandIssuer> {
+144 void validateCondition(ConditionContext<I> context, CEC execContext, P value) throws InvalidCommandArgument;
145 }
-146
-147 public interface ParameterCondition <P, CEC extends CommandExecutionContext, I extends CommandIssuer> {
-148 boolean validateCondition(ConditionContext<I> context, CEC execContext, P value) throws InvalidCommandArgument;
-149 }
-150}
+146}
diff --git a/docs/acf-core/src-html/co/aikar/commands/CommandConditions.ParameterCondition.html b/docs/acf-core/src-html/co/aikar/commands/CommandConditions.ParameterCondition.html
index 2c441bf8..289a3b0c 100644
--- a/docs/acf-core/src-html/co/aikar/commands/CommandConditions.ParameterCondition.html
+++ b/docs/acf-core/src-html/co/aikar/commands/CommandConditions.ParameterCondition.html
@@ -105,57 +105,53 @@
097 //noinspection unchecked
098 CC conditionContext = (CC) this.manager.createConditionContext(issuer, config);
099 //noinspection unchecked
-100 if (!condition.validateCondition(conditionContext)) {
-101 return;
-102 }
-103 }
-104 }
-105
-106 private void validateConditions(Conditions condAnno, CEC execContext, Object value) throws InvalidCommandArgument {
-107 if (condAnno == null) {
-108 return;
-109 }
-110 String conditions = this.manager.getCommandReplacements().replace(condAnno.value());
-111 I issuer = execContext.getIssuer();
-112 for (String cond : ACFPatterns.PIPE.split(conditions)) {
-113 String[] split = ACFPatterns.COLON.split(cond, 2);
-114 ParameterCondition condition;
-115 Class<?> cls = execContext.getParam().getType();
-116 String id = split[0].toLowerCase();
-117 do {
-118 condition = this.paramConditions.get(cls, id);
-119 if (condition == null && cls.getSuperclass() != null && cls.getSuperclass() != Object.class) {
-120 cls = cls.getSuperclass();
-121 } else {
-122 break;
-123 }
-124 } while (cls != null);
-125
-126
-127 if (condition == null) {
-128 RegisteredCommand cmd = execContext.getCmd();
-129 this.manager.log(LogLevel.ERROR, "Could not find command condition " + id + " for " + cmd.method.getName() + "::" +execContext.getParam().getName());
-130 continue;
-131 }
-132 String config = split.length == 2 ? split[1] : null;
-133 //noinspection unchecked
-134 CC conditionContext = (CC) this.manager.createConditionContext(issuer, config);
-135
-136 //noinspection unchecked
-137 if (!condition.validateCondition(conditionContext, execContext, value)) {
-138 return;
-139 }
-140 }
+100 condition.validateCondition(conditionContext);
+101 }
+102 }
+103
+104 private void validateConditions(Conditions condAnno, CEC execContext, Object value) throws InvalidCommandArgument {
+105 if (condAnno == null) {
+106 return;
+107 }
+108 String conditions = this.manager.getCommandReplacements().replace(condAnno.value());
+109 I issuer = execContext.getIssuer();
+110 for (String cond : ACFPatterns.PIPE.split(conditions)) {
+111 String[] split = ACFPatterns.COLON.split(cond, 2);
+112 ParameterCondition condition;
+113 Class<?> cls = execContext.getParam().getType();
+114 String id = split[0].toLowerCase();
+115 do {
+116 condition = this.paramConditions.get(cls, id);
+117 if (condition == null && cls.getSuperclass() != null && cls.getSuperclass() != Object.class) {
+118 cls = cls.getSuperclass();
+119 } else {
+120 break;
+121 }
+122 } while (cls != null);
+123
+124
+125 if (condition == null) {
+126 RegisteredCommand cmd = execContext.getCmd();
+127 this.manager.log(LogLevel.ERROR, "Could not find command condition " + id + " for " + cmd.method.getName() + "::" +execContext.getParam().getName());
+128 continue;
+129 }
+130 String config = split.length == 2 ? split[1] : null;
+131 //noinspection unchecked
+132 CC conditionContext = (CC) this.manager.createConditionContext(issuer, config);
+133
+134 //noinspection unchecked
+135 condition.validateCondition(conditionContext, execContext, value);
+136 }
+137 }
+138
+139 public interface Condition <I extends CommandIssuer> {
+140 void validateCondition(ConditionContext<I> context) throws InvalidCommandArgument;
141 }
142
-143 public interface Condition <I extends CommandIssuer> {
-144 boolean validateCondition(ConditionContext<I> context) throws InvalidCommandArgument;
+143 public interface ParameterCondition <P, CEC extends CommandExecutionContext, I extends CommandIssuer> {
+144 void validateCondition(ConditionContext<I> context, CEC execContext, P value) throws InvalidCommandArgument;
145 }
-146
-147 public interface ParameterCondition <P, CEC extends CommandExecutionContext, I extends CommandIssuer> {
-148 boolean validateCondition(ConditionContext<I> context, CEC execContext, P value) throws InvalidCommandArgument;
-149 }
-150}
+146}
diff --git a/docs/acf-core/src-html/co/aikar/commands/CommandConditions.html b/docs/acf-core/src-html/co/aikar/commands/CommandConditions.html
index 2c441bf8..289a3b0c 100644
--- a/docs/acf-core/src-html/co/aikar/commands/CommandConditions.html
+++ b/docs/acf-core/src-html/co/aikar/commands/CommandConditions.html
@@ -105,57 +105,53 @@
097 //noinspection unchecked
098 CC conditionContext = (CC) this.manager.createConditionContext(issuer, config);
099 //noinspection unchecked
-100 if (!condition.validateCondition(conditionContext)) {
-101 return;
-102 }
-103 }
-104 }
-105
-106 private void validateConditions(Conditions condAnno, CEC execContext, Object value) throws InvalidCommandArgument {
-107 if (condAnno == null) {
-108 return;
-109 }
-110 String conditions = this.manager.getCommandReplacements().replace(condAnno.value());
-111 I issuer = execContext.getIssuer();
-112 for (String cond : ACFPatterns.PIPE.split(conditions)) {
-113 String[] split = ACFPatterns.COLON.split(cond, 2);
-114 ParameterCondition condition;
-115 Class<?> cls = execContext.getParam().getType();
-116 String id = split[0].toLowerCase();
-117 do {
-118 condition = this.paramConditions.get(cls, id);
-119 if (condition == null && cls.getSuperclass() != null && cls.getSuperclass() != Object.class) {
-120 cls = cls.getSuperclass();
-121 } else {
-122 break;
-123 }
-124 } while (cls != null);
-125
-126
-127 if (condition == null) {
-128 RegisteredCommand cmd = execContext.getCmd();
-129 this.manager.log(LogLevel.ERROR, "Could not find command condition " + id + " for " + cmd.method.getName() + "::" +execContext.getParam().getName());
-130 continue;
-131 }
-132 String config = split.length == 2 ? split[1] : null;
-133 //noinspection unchecked
-134 CC conditionContext = (CC) this.manager.createConditionContext(issuer, config);
-135
-136 //noinspection unchecked
-137 if (!condition.validateCondition(conditionContext, execContext, value)) {
-138 return;
-139 }
-140 }
+100 condition.validateCondition(conditionContext);
+101 }
+102 }
+103
+104 private void validateConditions(Conditions condAnno, CEC execContext, Object value) throws InvalidCommandArgument {
+105 if (condAnno == null) {
+106 return;
+107 }
+108 String conditions = this.manager.getCommandReplacements().replace(condAnno.value());
+109 I issuer = execContext.getIssuer();
+110 for (String cond : ACFPatterns.PIPE.split(conditions)) {
+111 String[] split = ACFPatterns.COLON.split(cond, 2);
+112 ParameterCondition condition;
+113 Class<?> cls = execContext.getParam().getType();
+114 String id = split[0].toLowerCase();
+115 do {
+116 condition = this.paramConditions.get(cls, id);
+117 if (condition == null && cls.getSuperclass() != null && cls.getSuperclass() != Object.class) {
+118 cls = cls.getSuperclass();
+119 } else {
+120 break;
+121 }
+122 } while (cls != null);
+123
+124
+125 if (condition == null) {
+126 RegisteredCommand cmd = execContext.getCmd();
+127 this.manager.log(LogLevel.ERROR, "Could not find command condition " + id + " for " + cmd.method.getName() + "::" +execContext.getParam().getName());
+128 continue;
+129 }
+130 String config = split.length == 2 ? split[1] : null;
+131 //noinspection unchecked
+132 CC conditionContext = (CC) this.manager.createConditionContext(issuer, config);
+133
+134 //noinspection unchecked
+135 condition.validateCondition(conditionContext, execContext, value);
+136 }
+137 }
+138
+139 public interface Condition <I extends CommandIssuer> {
+140 void validateCondition(ConditionContext<I> context) throws InvalidCommandArgument;
141 }
142
-143 public interface Condition <I extends CommandIssuer> {
-144 boolean validateCondition(ConditionContext<I> context) throws InvalidCommandArgument;
+143 public interface ParameterCondition <P, CEC extends CommandExecutionContext, I extends CommandIssuer> {
+144 void validateCondition(ConditionContext<I> context, CEC execContext, P value) throws InvalidCommandArgument;
145 }
-146
-147 public interface ParameterCondition <P, CEC extends CommandExecutionContext, I extends CommandIssuer> {
-148 boolean validateCondition(ConditionContext<I> context, CEC execContext, P value) throws InvalidCommandArgument;
-149 }
-150}
+146}