PonyMirrors/Unicopia
1
0
Fork 0
mirror of https://github.com/Sollace/Unicopia.git synced 2025-02-17 10:24:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

Cancel velocity when changing dimensions. #329

Browse source
This commit is contained in:
Sollace 2024-04-09 11:29:14 +01:00
parent 51d67d5215
commit d5e4b69aec
No known key found for this signature in database
GPG key ID: E52FACE7B5C773DB
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,7 +1,10 @@
package com.minelittlepony.unicopia.entity.player; package com.minelittlepony.unicopia.entity.player;
import java.util.Optional;
import java.util.function.Supplier; import java.util.function.Supplier;
import org.jetbrains.annotations.Nullable;
import com.minelittlepony.unicopia.*; import com.minelittlepony.unicopia.*;
import com.minelittlepony.unicopia.ability.Abilities; import com.minelittlepony.unicopia.ability.Abilities;
import com.minelittlepony.unicopia.ability.magic.SpellPredicate; import com.minelittlepony.unicopia.ability.magic.SpellPredicate;
@ -81,7 +84,9 @@ public class PlayerPhysics extends EntityPhysics<PlayerEntity> implements Tickab
private int wallHitCooldown; private int wallHitCooldown;
private Vec3d lastPos = Vec3d.ZERO; @Nullable
private DimensionType lastDimension;
private Optional<Vec3d> lastPos = Optional.empty();
private Vec3d lastVel = Vec3d.ZERO; private Vec3d lastVel = Vec3d.ZERO;
private final PlayerDimensions dimensions; private final PlayerDimensions dimensions;
@ -247,8 +252,14 @@ public class PlayerPhysics extends EntityPhysics<PlayerEntity> implements Tickab
ticksToGlide--; ticksToGlide--;
} }
lastVel = entity.getPos().subtract(lastPos); DimensionType dimension = entity.getWorld().getDimension();
lastPos = entity.getPos(); if (dimension != lastDimension) {
lastDimension = dimension;
lastPos = Optional.empty();
}
lastVel = lastPos.map(entity.getPos()::subtract).orElse(Vec3d.ZERO);
lastPos = Optional.of(entity.getPos());
final MutableVector velocity = new MutableVector(entity.getVelocity()); final MutableVector velocity = new MutableVector(entity.getVelocity());
@ -546,7 +557,7 @@ public class PlayerPhysics extends EntityPhysics<PlayerEntity> implements Tickab
private void checkAvianTakeoffConditions(MutableVector velocity) { private void checkAvianTakeoffConditions(MutableVector velocity) {
double horMotion = getHorizontalMotion(); double horMotion = getHorizontalMotion();
double motion = entity.getPos().subtract(lastPos).lengthSquared(); double motion = lastVel.lengthSquared();
boolean takeOffCondition = boolean takeOffCondition =
(horMotion > 0.05 || motion > 0.05) (horMotion > 0.05 || motion > 0.05)