From 895a7bff604e09e02be96d936ac1c976dae8bf83 Mon Sep 17 00:00:00 2001
From: Sollace <sollacea@gmail.com>
Date: Sun, 13 Oct 2024 18:18:50 +0100
Subject: [PATCH] Change criterion check to an OR for tribe joins

# Conflicts:
#	src/main/java/com/minelittlepony/unicopia/datagen/providers/UAdvancementsProvider.java
---
 .../unicopia/datagen/providers/UAdvancementsProvider.java        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/com/minelittlepony/unicopia/datagen/providers/UAdvancementsProvider.java b/src/main/java/com/minelittlepony/unicopia/datagen/providers/UAdvancementsProvider.java
index 4b1760fa..42352276 100644
--- a/src/main/java/com/minelittlepony/unicopia/datagen/providers/UAdvancementsProvider.java
+++ b/src/main/java/com/minelittlepony/unicopia/datagen/providers/UAdvancementsProvider.java
@@ -67,6 +67,7 @@ public class UAdvancementsProvider extends FabricAdvancementProvider {
             for (Race r : extra) {
                 builder.criterion("be_" + r.getId().getPath(), new RaceChangeCriterion.Conditions(LootContextPredicate.EMPTY, r));
             }
+            builder.criteriaMerger(CriterionMerger.OR);
         }
 
         return builder.build(consumer, race.getId().getPath() + "_route");