Fairy hats grant flight (#2).

This commit is contained in:
Ammon Lauritzen 2016-02-23 15:39:31 -06:00
parent 7575ab211e
commit b45fd15ffe

View File

@ -324,17 +324,16 @@ public class EntityFairy extends EntityAnimal {
if (flymode()) {
if (!liftOff() && ridingEntity != null && !ridingEntity.onGround
&& ridingEntity instanceof EntityLiving) {
&& ridingEntity instanceof EntityLivingBase) {
ridingEntity.fallDistance = 0F;
if (ridingEntity.motionY < FairyConfig.DEF_FLOAT_RATE) {
ridingEntity.motionY = FairyConfig.DEF_FLOAT_RATE;
}
// TODO: research how to find this now
final boolean isJumping = false; // ((EntityLiving)ridingEntity).isJumping
if (isJumping && ridingEntity.motionY < FairyConfig.DEF_FLAP_RATE
&& canFlap()) {
final boolean isJumping = ReflectionHelper.getPrivateValue(EntityLivingBase.class,
(EntityLivingBase)ridingEntity, "isJumping");
if (isJumping && ridingEntity.motionY < FairyConfig.DEF_FLAP_RATE && canFlap()) {
ridingEntity.motionY = FairyConfig.DEF_FLAP_RATE;
}
} else {