aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/shcm/shsupercm/fabric/citresewn/OptionalCompat.java
diff options
context:
space:
mode:
authorSHsuperCM <shsupercm@gmail.com>2021-09-14 20:19:35 +0300
committerSHsuperCM <shsupercm@gmail.com>2021-09-14 20:19:35 +0300
commitbfa600f2829a29b77c90063041a9db057aa70b14 (patch)
tree3dd05c97ee8995c2f2002988dd766f0e8ec80c4b /src/main/java/shcm/shsupercm/fabric/citresewn/OptionalCompat.java
parentb84a1aa3afe1b917b10157ba5af7843873fe6af0 (diff)
downloadCITResewn-bfa600f2829a29b77c90063041a9db057aa70b14.tar.gz
CITResewn-bfa600f2829a29b77c90063041a9db057aa70b14.tar.bz2
CITResewn-bfa600f2829a29b77c90063041a9db057aa70b14.zip
Fixed bug with Cosmetic Armor support
Closes #23
Diffstat (limited to 'src/main/java/shcm/shsupercm/fabric/citresewn/OptionalCompat.java')
-rw-r--r--src/main/java/shcm/shsupercm/fabric/citresewn/OptionalCompat.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/shcm/shsupercm/fabric/citresewn/OptionalCompat.java b/src/main/java/shcm/shsupercm/fabric/citresewn/OptionalCompat.java
index 7558d03..ea77f5e 100644
--- a/src/main/java/shcm/shsupercm/fabric/citresewn/OptionalCompat.java
+++ b/src/main/java/shcm/shsupercm/fabric/citresewn/OptionalCompat.java
@@ -4,6 +4,7 @@ import io.github.apace100.cosmetic_armor.CosmeticArmor;
import net.minecraft.entity.EquipmentSlot;
import net.minecraft.entity.LivingEntity;
import net.minecraft.item.ItemStack;
+import net.minecraft.item.Items;
import java.util.function.Predicate;
@@ -18,10 +19,10 @@ public final class OptionalCompat {
compatCosmeticArmor = isLoaded.test("cosmetic-armor") ? CompatCosmeticArmor.impl() : null;
}
- public static ItemStack getCosmeticArmor(ItemStack original, LivingEntity entity, EquipmentSlot slot) {
+ public static ItemStack getCosmeticArmor(ItemStack original, LivingEntity entity, EquipmentSlot slot, boolean elytra) {
if (INSTANCE().compatCosmeticArmor != null) {
ItemStack stackInCosmeticSlot = INSTANCE().compatCosmeticArmor.getStackInCosmeticSlot(entity, slot);
- if (!stackInCosmeticSlot.isEmpty())
+ if (!stackInCosmeticSlot.isEmpty() && (!elytra || stackInCosmeticSlot.isOf(Items.ELYTRA)))
return stackInCosmeticSlot;
}