Fix null condition in addConditions

apple502j · Apr 9, 2024 · a431beb · a431beb
1 parent 9c3cc6a
commit a431beb
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/...pi-v1/src/main/java/net/fabricmc/fabric/api/resource/conditions/v1/ResourceCondition.java b/...pi-v1/src/main/java/net/fabricmc/fabric/api/resource/conditions/v1/ResourceCondition.java
@@ -51,6 +51,9 @@ public interface ResourceCondition {
 	static void addConditions(JsonObject baseObject, ResourceCondition... conditions) {
 		if (baseObject.has(ResourceConditions.CONDITIONS_KEY)) {
 			throw new IllegalArgumentException("Object already has a condition entry: " + baseObject);
+		} else if (conditions == null || conditions.length == 0) {
+			// Datagen might pass null conditions.
+			return;
 		}
 
 		baseObject.add(ResourceConditions.CONDITIONS_KEY, LIST_CODEC.encodeStart(JsonOps.INSTANCE, Arrays.asList(conditions)).getOrThrow());