do not verify warnings if a fatal error is present

QuiltMC · Jul 5, 2024 · 67e1587 · 67e1587
1 parent 04ee96e
commit 67e1587
Showing 1 changed file with 13 additions and 8 deletions.
diff --git a/enigma/src/main/java/org/quiltmc/enigma/util/validation/ValidationContext.java b/enigma/src/main/java/org/quiltmc/enigma/util/validation/ValidationContext.java
@@ -66,18 +66,23 @@ public void raise(Message message, Object... args) {
 	public boolean canProceed() {
 		List<ParameterizedMessage> messagesCopy = new ArrayList<>(this.messages);
 
-		if (this.verifyWarnings) {
-			for (ParameterizedMessage m : messagesCopy) {
-				if (m.getType() == Message.Type.WARNING) {
-					this.messages.remove(m);
-					if (!this.notifier.verifyWarning(m)) {
-						return false;
+		boolean hasError = this.messages.stream().noneMatch(m -> m.message().getType() == Message.Type.ERROR);
+		if (hasError) {
+			return false;
+		} else {
+			if (this.verifyWarnings) {
+				for (ParameterizedMessage m : messagesCopy) {
+					if (m.getType() == Message.Type.WARNING) {
+						this.messages.remove(m);
+						if (!this.notifier.verifyWarning(m)) {
+							return false;
+						}
 					}
 				}
 			}
-		}
 
-		return this.messages.stream().noneMatch(m -> m.message().getType() == Message.Type.ERROR);
+			return true;
+		}
 	}
 
 	/**