From 2ddfd77a7d1817404583b947bd326bd7a13b41bf Mon Sep 17 00:00:00 2001
From: Nico Mexis <nico.mexis@kabelmail.de>
Date: Fri, 7 Mar 2025 14:21:23 +0100
Subject: [PATCH] Fix conflicting resource conditions

Fixes #154
Fixes #129
This is somewhat akin to 59440bcc3f445bcbeb3181d7fd156f43ae11582c, but for 1.20.1
---
 .../fabric/api/resource/conditions/v1/ResourceConditions.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/api/resource/conditions/v1/ResourceConditions.java b/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/api/resource/conditions/v1/ResourceConditions.java
index 4f26822b8..a1d3af254 100644
--- a/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/api/resource/conditions/v1/ResourceConditions.java
+++ b/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/api/resource/conditions/v1/ResourceConditions.java
@@ -122,6 +122,7 @@ public static Predicate<JsonObject> get(Identifier identifier) {
 	 * <p>If an exception is thrown during condition testing, it will be caught and logged, and false will be returned.
 	 */
 	public static boolean objectMatchesConditions(JsonObject object) {
+		if (JsonHelper.hasArray(object, "conditions")) return true;
 		try {
 			JsonArray conditions = JsonHelper.getArray(object, CONDITIONS_KEY, null);