Change criterion check to an OR for tribe joins

Sollace · Oct 13, 2024 · 708f919 · 708f919
1 parent fc5fec1
commit 708f919
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/src/main/java/com/minelittlepony/unicopia/datagen/providers/UAdvancementsProvider.java b/src/main/java/com/minelittlepony/unicopia/datagen/providers/UAdvancementsProvider.java
@@ -21,6 +21,7 @@
 import net.minecraft.advancement.AdvancementEntry;
 import net.minecraft.advancement.AdvancementFrame;
 import net.minecraft.advancement.AdvancementRequirements;
+import net.minecraft.advancement.AdvancementRequirements.CriterionMerger;
 import net.minecraft.advancement.AdvancementRewards;
 import net.minecraft.advancement.criterion.ConsumeItemCriterion;
 import net.minecraft.advancement.criterion.Criteria;
@@ -67,6 +68,7 @@ private AdvancementDisplayBuilder.Parent createTribeRootAdvancement(Consumer<Adv
             for (Race r : extra) {
                 builder.criterion("be_" + r.getId().getPath(), UCriteria.PLAYER_CHANGE_RACE.create(new RaceChangeCriterion.Conditions(Optional.empty(), r)));
             }
+            builder.criteriaMerger(CriterionMerger.OR);
         }
 
         return builder.build(consumer, race.getId().getPath() + "_route");