Fix previous fix accidently not removing rules in a slightly differen…

…t case.
QuiltMC · Aug 29, 2024 · b0606ef · b0606ef
1 parent be5ac16
commit b0606ef
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -5,7 +5,7 @@ group = org.quiltmc
 description = The mod loading component of Quilt
 url = https://github.com/quiltmc/quilt-loader
 # Don't forget to change this in QuiltLoaderImpl as well
-quilt_loader = 0.26.4-beta.4
+quilt_loader = 0.26.4-beta.5
 
 # Fabric & Quilt Libraries
 asm = 9.6

diff --git a/src/main/java/org/quiltmc/loader/impl/QuiltLoaderImpl.java b/src/main/java/org/quiltmc/loader/impl/QuiltLoaderImpl.java
@@ -132,7 +132,7 @@ public final class QuiltLoaderImpl {
 
 	public static final int ASM_VERSION = Opcodes.ASM9;
 
-	public static final String VERSION = "0.26.4-beta.4";
+	public static final String VERSION = "0.26.4-beta.5";
 	public static final String MOD_ID = "quilt_loader";
 	public static final String DEFAULT_MODS_DIR = "mods";
 	public static final String DEFAULT_CACHE_DIR = ".cache";

diff --git a/src/main/java/org/quiltmc/loader/impl/solver/SolverPreProcessor.java b/src/main/java/org/quiltmc/loader/impl/solver/SolverPreProcessor.java
@@ -462,14 +462,13 @@ private ProcessedRuleSet process() throws ContradictionException, PreProcessExce
 				remaining.add(currentMin);
 				remaining.add(currentMax);
 				remaining.remove(null);
-				final Set<RuleDefinition> removing;
 				if (remaining.size() == 1) {
-					removing = new HashSet<>();
+					Set<RuleDefinition> removing = new HashSet<>();
 					removing.addAll(rules);
 					removing.removeAll(remaining);
-				} else {
-					removing = rules;
 					removing.forEach(this::removeRule);
+				} else {
+					rules.forEach(this::removeRule);
 					final Rule rule = remaining.iterator().next().rule;
 					final LoadOption[] array = optionSet.toArray(new LoadOption[0]);
 					if (max < optionSet.size()) {