Upstream/NoCheatPlus
1
0
Fork 0
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git synced 2024-11-07 11:10:05 +01:00
Code Issues Projects Releases Wiki Activity

Reset fall distance and NoFall data on a fly-nofly transition.

Browse Source
This commit is contained in:
asofold 2016-01-12 00:06:27 +01:00
parent ec2c63101e
commit 3bcfeffdbf
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/moving/MovingListener.java
View File

@ -672,7 +672,7 @@ public class MovingListener extends CheckListener implements TickListener, IRemo
// Hack: Add velocity for transitions between creativefly and survivalfly. // Hack: Add velocity for transitions between creativefly and survivalfly.
if (lastMove.toIsValid && lastMove.flyCheck == CheckType.MOVING_CREATIVEFLY) { if (lastMove.toIsValid && lastMove.flyCheck == CheckType.MOVING_CREATIVEFLY) {
workaroundFlyNoFlyTransition(tick, data); workaroundFlyNoFlyTransition(player, tick, data);
} }
// Actual check. // Actual check.
@ -784,13 +784,17 @@ public class MovingListener extends CheckListener implements TickListener, IRemo
* @param tick * @param tick
* @param data * @param data
*/ */
private static void workaroundFlyNoFlyTransition(final int tick, final MovingData data) { private static void workaroundFlyNoFlyTransition(final Player player, final int tick, final MovingData data) {
final MoveData lastMove = data.moveData.getFirst(); final MoveData lastMove = data.moveData.getFirst();
final double amount = lastMove.hDistance * Magic.FRICTION_MEDIUM_AIR; final double amount = lastMove.hDistance * Magic.FRICTION_MEDIUM_AIR;
data.addHorizontalVelocity(new AccountEntry(tick, amount, 1, MovingData.getHorVelValCount(amount))); data.addHorizontalVelocity(new AccountEntry(tick, amount, 1, MovingData.getHorVelValCount(amount)));
data.addVerticalVelocity(new SimpleEntry(lastMove.yDistance, 2)); data.addVerticalVelocity(new SimpleEntry(lastMove.yDistance, 2));
data.addVerticalVelocity(new SimpleEntry(0.0, 2)); data.addVerticalVelocity(new SimpleEntry(0.0, 2));
data.setFrictionJumpPhase(); data.setFrictionJumpPhase();
// Reset fall height.
// TODO: Later (e.g. 1.9) check for the ModelFlying, if fall damage is intended.
data.clearNoFallData();
player.setFallDistance(0f);
} }
/** /**
@ -1202,6 +1206,7 @@ public class MovingListener extends CheckListener implements TickListener, IRemo
// TODO: Log? // TODO: Log?
if (!event.isCancelled()) { if (!event.isCancelled()) {
// TODO: Log! // TODO: Log!
// TODO: Reset yaw rate, such as to accept any yaw to start with (!).
} }
data.resetTeleported(); data.resetTeleported();
return; return;