From d35f839c3f43e3396ae89f14d7978d43b080acc5 Mon Sep 17 00:00:00 2001
From: Sollace <sollacea@gmail.com>
Date: Sat, 27 Oct 2018 10:19:34 +0200
Subject: [PATCH] Fixed the crouching pony bunny hop bug

---
 .../java/com/minelittlepony/model/AbstractPonyModel.java     | 2 +-
 .../com/minelittlepony/model/ponies/ModelZombiePony.java     | 1 -
 src/main/java/com/minelittlepony/pony/data/IPony.java        | 4 ++--
 src/main/java/com/minelittlepony/pony/data/Pony.java         | 5 ++---
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/minelittlepony/model/AbstractPonyModel.java b/src/main/java/com/minelittlepony/model/AbstractPonyModel.java
index d84840c2..0b4d6772 100644
--- a/src/main/java/com/minelittlepony/model/AbstractPonyModel.java
+++ b/src/main/java/com/minelittlepony/model/AbstractPonyModel.java
@@ -88,7 +88,7 @@ public abstract class AbstractPonyModel extends ModelPlayer implements IModel, P
         isChild = entity.isChild();
         isSneak = entity.isSneaking();
         isSleeping = entity.isPlayerSleeping();
-        isFlying = pony.isPegasusFlying(entity);
+        isFlying = pony.isFlying(entity);
         isElytraFlying = entity.isElytraFlying();
         isSwimming = pony.isSwimming(entity);
         headGear = pony.isWearingHeadgear(entity);
diff --git a/src/main/java/com/minelittlepony/model/ponies/ModelZombiePony.java b/src/main/java/com/minelittlepony/model/ponies/ModelZombiePony.java
index 2348ca72..1dbcbacb 100644
--- a/src/main/java/com/minelittlepony/model/ponies/ModelZombiePony.java
+++ b/src/main/java/com/minelittlepony/model/ponies/ModelZombiePony.java
@@ -14,7 +14,6 @@ public class ModelZombiePony extends ModelMobPony {
     @Override
     public void setLivingAnimations(EntityLivingBase entity, float move, float swing, float ticks) {
         isPegasus = entity.getUniqueID().getLeastSignificantBits() % 30 == 0;
-        isFlying = !entity.onGround;
     }
 
     @Override
diff --git a/src/main/java/com/minelittlepony/pony/data/IPony.java b/src/main/java/com/minelittlepony/pony/data/IPony.java
index bb1c3431..aec13f04 100644
--- a/src/main/java/com/minelittlepony/pony/data/IPony.java
+++ b/src/main/java/com/minelittlepony/pony/data/IPony.java
@@ -27,12 +27,12 @@ public interface IPony {
 
     /**
      * Returns true if the provided entity is flying like a pegasus.
-     * True if the entity is off the ground, has race with wings.
+     * True if the entity is off the ground.
      * Creative flight counts only if the entity is <i>not</i> on the ground.
      *
      * Entities that are riding, climbing a ladder, or swimming are <i>not</i> flying.
      */
-    boolean isPegasusFlying(EntityLivingBase entity);
+    boolean isFlying(EntityLivingBase entity);
 
     /**
      * Returns true if the provided antity is actively wimming.
diff --git a/src/main/java/com/minelittlepony/pony/data/Pony.java b/src/main/java/com/minelittlepony/pony/data/Pony.java
index 47f05cb5..c60bc336 100644
--- a/src/main/java/com/minelittlepony/pony/data/Pony.java
+++ b/src/main/java/com/minelittlepony/pony/data/Pony.java
@@ -99,9 +99,8 @@ public class Pony implements IPony {
     }
 
     @Override
-    public boolean isPegasusFlying(EntityLivingBase entity) {
-        return getRace(false).hasWings() &&
-                !(entity.onGround || entity.isRiding() || entity.isOnLadder() || entity.isInWater());
+    public boolean isFlying(EntityLivingBase entity) {
+        return !(entity.onGround || entity.isRiding() || entity.isOnLadder() || entity.isInWater());
     }
 
     @Override