Fix cape predicate

itsmeow · Feb 1, 2022 · baceb83 · baceb83
1 parent c441e4a
commit baceb83
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/common/src/main/resources/data/trinkets/slots/chest/cape.json b/common/src/main/resources/data/trinkets/slots/chest/cape.json
@@ -1,6 +1,7 @@
 {
     "replace": false,
     "validator_predicates": [
+        "trinkets:tag",
         "betteranimalsplus:cape_allowed"
     ]
 }
diff --git a/fabric/src/main/java/dev/itsmeow/betteranimalsplus/compat/trinkets/TrinketsModCompat.java b/fabric/src/main/java/dev/itsmeow/betteranimalsplus/compat/trinkets/TrinketsModCompat.java
@@ -13,10 +13,10 @@ public class TrinketsModCompat {
     public static void init() {
         ItemCape.can_equip = (stack, armorType, entity) -> !TrinketsApi.getTrinketComponent((LivingEntity) entity).get().isEquipped(s -> s.getItem() instanceof ItemCape);
         TrinketsApi.registerTrinketPredicate(new ResourceLocation(Ref.MOD_ID, "cape_allowed"), (stack, slot, entity) -> {
-            if (stack.getItem() instanceof ItemCape && entity.getItemBySlot(EquipmentSlot.CHEST).getItem() instanceof ItemCape) {
+            if (stack.getItem() instanceof ItemCape && (entity.getItemBySlot(EquipmentSlot.CHEST).getItem() instanceof ItemCape || !ItemCape.can_equip.canEquip(stack, EquipmentSlot.CHEST, entity))) {
                 return TriState.FALSE;
             }
-            return TriState.TRUE;
+            return TriState.DEFAULT;
         });
     }