PonyMirrors/Unicopia
1
0
Fork 0
mirror of https://github.com/Sollace/Unicopia.git synced 2024-11-27 15:17:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixed flying not being disabled for non-flying diguises

Browse source
This commit is contained in:
Sollace 2020-10-02 14:04:10 +02:00
parent c4c9d288a9
commit db23786b70
1 changed files with 38 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
src/main/java/com/minelittlepony/unicopia/entity/player/PlayerPhysics.java
View file

@ -106,56 +106,58 @@ public class PlayerPhysics extends EntityPhysics<Pony> implements Tickable, Moti
} }
} }
if (isFlying()) { if (canFly) {
int level = pony.getLevel().get() + 1; if (isFlying()) {
int level = pony.getLevel().get() + 1;
if (ticksInAir++ > (level * 100)) { if (ticksInAir++ > (level * 100)) {
Bar mana = pony.getMagicalReserves().getMana(); Bar mana = pony.getMagicalReserves().getMana();
mana.add((int)(-getHorizontalMotion(entity) * 50 / level)); mana.add((int)(-getHorizontalMotion(entity) * 50 / level));
if (mana.getPercentFill() < 0.2) { if (mana.getPercentFill() < 0.2) {
pony.getMagicalReserves().getExertion().add(2); pony.getMagicalReserves().getExertion().add(2);
pony.getMagicalReserves().getEnergy().add(2 + (int)(getHorizontalMotion(entity) * 5)); pony.getMagicalReserves().getEnergy().add(2 + (int)(getHorizontalMotion(entity) * 5));
if (mana.getPercentFill() < 0.1 && ticksInAir % 10 == 0) { if (mana.getPercentFill() < 0.1 && ticksInAir % 10 == 0) {
float exhaustion = (0.3F * ticksInAir) / 70; float exhaustion = (0.3F * ticksInAir) / 70;
if (entity.isSprinting()) { if (entity.isSprinting()) {
exhaustion *= 3.11F; exhaustion *= 3.11F;
}
entity.addExhaustion(exhaustion);
} }
entity.addExhaustion(exhaustion);
} }
} }
}
entity.fallDistance = 0; entity.fallDistance = 0;
moveFlying(entity, velocity); moveFlying(entity, velocity);
if (entity.world.hasRain(entity.getBlockPos())) { if (entity.world.hasRain(entity.getBlockPos())) {
applyTurbulance(entity, velocity); applyTurbulance(entity, velocity);
} }
if (entity.world.isClient && ticksInAir % 20 == 0 && entity.getVelocity().length() < 0.29) { if (entity.world.isClient && ticksInAir % 20 == 0 && entity.getVelocity().length() < 0.29) {
entity.playSound(getWingSound(), 0.5F, 1); entity.playSound(getWingSound(), 0.5F, 1);
thrustScale = 1; thrustScale = 1;
} }
velocity.y -= 0.02; velocity.y -= 0.02;
} else { } else {
ticksInAir = 0; ticksInAir = 0;
if (!creative) { if (!creative) {
double horMotion = getHorizontalMotion(entity); double horMotion = getHorizontalMotion(entity);
double motion = entity.getPos().subtract(lastPos).lengthSquared(); double motion = entity.getPos().subtract(lastPos).lengthSquared();
if (velocity.y > 0 && (horMotion > 0.2 || (motion > 0.2 && velocity.y < -0.2))) { if (velocity.y > 0 && (horMotion > 0.2 || (motion > 0.2 && velocity.y < -0.2))) {
entity.abilities.flying = true; entity.abilities.flying = true;
isFlyingEither = true; isFlyingEither = true;
isFlyingSurvival = true; isFlyingSurvival = true;
velocity.y += horMotion + 0.3; velocity.y += horMotion + 0.3;
applyThrust(entity, velocity); applyThrust(entity, velocity);
}
} }
} }
} }