From b8e2db12f0e006de1cfb8834b4516525953d5378 Mon Sep 17 00:00:00 2001
From: Sollace <sollacea@gmail.com>
Date: Tue, 9 Apr 2024 11:48:36 +0100
Subject: [PATCH] Fixed bat ponies having both bat wings and icarus wings when
 wearing the wings of icarus

---
 .../unicopia/client/render/BatWingsFeatureRenderer.java      | 5 ++++-
 .../unicopia/client/render/WingsFeatureRenderer.java         | 4 +++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/minelittlepony/unicopia/client/render/BatWingsFeatureRenderer.java b/src/main/java/com/minelittlepony/unicopia/client/render/BatWingsFeatureRenderer.java
index 32cb9aed..59af0f4f 100644
--- a/src/main/java/com/minelittlepony/unicopia/client/render/BatWingsFeatureRenderer.java
+++ b/src/main/java/com/minelittlepony/unicopia/client/render/BatWingsFeatureRenderer.java
@@ -2,6 +2,7 @@ package com.minelittlepony.unicopia.client.render;
 
 import com.minelittlepony.unicopia.Race;
 import com.minelittlepony.unicopia.Unicopia;
+import com.minelittlepony.unicopia.entity.AmuletSelectors;
 import com.minelittlepony.unicopia.entity.player.Pony;
 
 import net.minecraft.client.model.Dilation;
@@ -56,7 +57,9 @@ public class BatWingsFeatureRenderer<E extends LivingEntity> extends WingsFeatur
 
     @Override
     protected boolean canRender(E entity) {
-        return entity instanceof PlayerEntity && Pony.of((PlayerEntity)entity).getObservedSpecies() == Race.BAT;
+        return entity instanceof PlayerEntity
+                && Pony.of((PlayerEntity)entity).getObservedSpecies() == Race.BAT
+                && !AmuletSelectors.PEGASUS_AMULET.test(entity);
     }
 
     @Override
diff --git a/src/main/java/com/minelittlepony/unicopia/client/render/WingsFeatureRenderer.java b/src/main/java/com/minelittlepony/unicopia/client/render/WingsFeatureRenderer.java
index d37171db..1a418971 100644
--- a/src/main/java/com/minelittlepony/unicopia/client/render/WingsFeatureRenderer.java
+++ b/src/main/java/com/minelittlepony/unicopia/client/render/WingsFeatureRenderer.java
@@ -3,6 +3,7 @@ package com.minelittlepony.unicopia.client.render;
 import com.minelittlepony.unicopia.FlightType;
 import com.minelittlepony.unicopia.Race;
 import com.minelittlepony.unicopia.Unicopia;
+import com.minelittlepony.unicopia.entity.AmuletSelectors;
 import com.minelittlepony.unicopia.entity.player.Pony;
 
 import net.minecraft.client.model.Dilation;
@@ -54,7 +55,8 @@ public class WingsFeatureRenderer<E extends LivingEntity> implements AccessoryFe
     protected boolean canRender(E entity) {
         return entity instanceof PlayerEntity player
                 && Pony.of(player).getObservedSpecies().flightType() == FlightType.AVIAN
-                && Pony.of(player).getObservedSpecies() != Race.BAT;
+                && Pony.of(player).getObservedSpecies() != Race.BAT
+                && !AmuletSelectors.PEGASUS_AMULET.test(entity);
     }
 
     protected Identifier getTexture(E entity) {