Fix fillycam

src/main/java/com/minelittlepony/client/PonyManagerImpl.java

@@ -53,8 +53,11 @@ public class PonyManagerImpl implements PonyManager, SimpleSynchronousResourceRe
     @Override
     public Pony getPony(PlayerEntity player) {
         final UUID id = player instanceof ForcedPony ? null : player.getGameProfile() == null ? player.getUuid() : player.getGameProfile().getId();
+        @Nullable
         Identifier skin = getSkin(player);
+        if (skin != null) {
             skin = MoreObjects.firstNonNull(PonySkinResolver.EVENT.invoker().onPonySkinResolving(player, s -> getPony(s, id), skin), skin);
+        }
         return getPony(skin, id);
     }
 
@@ -63,8 +66,11 @@ public class PonyManagerImpl implements PonyManager, SimpleSynchronousResourceRe
         if (entity instanceof PlayerEntity player) {
             return Optional.of(getPony(player));
         }
+        @Nullable
         Identifier skin = getSkin(entity);
+        if (skin != null) {
             skin = MoreObjects.firstNonNull(PonySkinResolver.EVENT.invoker().onPonySkinResolving(entity, s -> getPony(s, null), skin), skin);
+        }
         return skin == null ? Optional.empty() : Optional.of(getPony(skin, null));
     }
 

src/main/java/com/minelittlepony/client/mixin/MixinPlayerEntity.java

@@ -10,12 +10,11 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 import com.minelittlepony.api.pony.Pony;
 
-@Mixin(LivingEntity.class)
+@Mixin(PlayerEntity.class)
-abstract class MixinLivingEntity {
+abstract class MixinPlayerEntity {
     @Inject(method = "getBaseDimensions", at = @At("RETURN"), cancellable = true)
     private void onGetBaseDimensions(EntityPose pose, CallbackInfoReturnable<EntityDimensions> info) {
-        if (((Object)this) instanceof PlayerEntity player) {
+        Pony pony = Pony.getManager().getPony((PlayerEntity)(Object)this);
-            Pony pony = Pony.getManager().getPony(player);
 
         if (!pony.race().isHuman()) {
             float factor = pony.size().eyeHeightFactor();
@@ -26,4 +25,3 @@ abstract class MixinLivingEntity {
         }
     }
 }
-}

src/main/resources/minelp.mixin.json

@@ -12,7 +12,7 @@
         "MixinSkullBlockEntityRenderer",
         "MixinHeldItemRenderer",
         "MixinClientPlayerEntity",
-        "MixinLivingEntity",
+        "MixinPlayerEntity",
         "MixinPlayerMoveC2SPacket",
         "MixinPlayerPositionLookS2CPacket",
         "MixinVertextConsumers",