From 1cab1bd16a3c365dd79fe2cfc717b2d45a7f8f2f Mon Sep 17 00:00:00 2001
From: Sollace <sollacea@gmail.com>
Date: Tue, 9 Apr 2024 11:44:42 +0100
Subject: [PATCH] Fixed bat ponies having both bat and pegasus wings

---
 .../unicopia/client/minelittlepony/BodyPartGear.java         | 2 +-
 .../unicopia/client/render/WingsFeatureRenderer.java         | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/minelittlepony/unicopia/client/minelittlepony/BodyPartGear.java b/src/main/java/com/minelittlepony/unicopia/client/minelittlepony/BodyPartGear.java
index 76f267f5..f3eadd4b 100644
--- a/src/main/java/com/minelittlepony/unicopia/client/minelittlepony/BodyPartGear.java
+++ b/src/main/java/com/minelittlepony/unicopia/client/minelittlepony/BodyPartGear.java
@@ -47,7 +47,7 @@ class BodyPartGear<M extends ClientPonyModel<LivingEntity> & MsonModel & IModel>
     public static final Predicate<LivingEntity> UNICORN_HORN_PREDICATE = MINE_LP_HAS_NO_HORN.and(AmuletSelectors.ALICORN_AMULET.or(EquinePredicates.raceMatches(com.minelittlepony.unicopia.Race::canCast)));
     public static final Identifier UNICORN_HORN = Unicopia.id("textures/models/horn/unicorn.png");
 
-    public static final Predicate<LivingEntity> PEGA_WINGS_PREDICATE = MINE_LP_HAS_NO_WINGS.and(AmuletSelectors.PEGASUS_AMULET.or(EquinePredicates.raceMatches(race -> race.flightType() == FlightType.AVIAN)));
+    public static final Predicate<LivingEntity> PEGA_WINGS_PREDICATE = MINE_LP_HAS_NO_WINGS.and(AmuletSelectors.PEGASUS_AMULET.or(EquinePredicates.raceMatches(race -> race != com.minelittlepony.unicopia.Race.BAT && race.flightType() == FlightType.AVIAN)));
     public static final Identifier PEGASUS_WINGS = Unicopia.id("textures/models/wings/pegasus_pony.png");
 
     public static BodyPartGear<WingsGearModel> pegasusWings() {
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 10c8ecc3..d37171db 100644
--- a/src/main/java/com/minelittlepony/unicopia/client/render/WingsFeatureRenderer.java
+++ b/src/main/java/com/minelittlepony/unicopia/client/render/WingsFeatureRenderer.java
@@ -1,6 +1,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.player.Pony;
 
@@ -51,7 +52,9 @@ public class WingsFeatureRenderer<E extends LivingEntity> implements AccessoryFe
     }
 
     protected boolean canRender(E entity) {
-        return entity instanceof PlayerEntity && Pony.of((PlayerEntity)entity).getObservedSpecies().flightType() == FlightType.AVIAN;
+        return entity instanceof PlayerEntity player
+                && Pony.of(player).getObservedSpecies().flightType() == FlightType.AVIAN
+                && Pony.of(player).getObservedSpecies() != Race.BAT;
     }
 
     protected Identifier getTexture(E entity) {