Upstream/NoCheatPlus
1
0
Fork 0
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git synced 2024-06-26 06:14:42 +02:00
Code Issues Projects Releases Wiki Activity

Allow some friction upwards on climbable for now.

Browse Source 
Seems to mostly concern receiving velocity when on ground, though.

Issues remain with vdistrel when moving off climbable.
This commit is contained in:
asofold 2016-06-14 00:18:41 +02:00
parent 8aced9d116
commit b6fa205508
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/moving/player/SurvivalFly.java
View File

@ -361,7 +361,8 @@ public class SurvivalFly extends Check {
}
else if (from.isOnClimbable()) {
// Ladder types.
vDistanceAboveLimit = vDistClimbable(player, from, fromOnGround, toOnGround, yDistance, data);
vDistanceAboveLimit = vDistClimbable(player, from, to, fromOnGround, toOnGround,
thisMove, lastMove, yDistance, data);
}
else if (thisMove.from.inLiquid) { // && (Math.abs(yDistance) > 0.2 || to.isInLiquid())) {
// Swimming...
@ -1648,11 +1649,16 @@ public class SurvivalFly extends Check {
* @param from
* @param fromOnGround
* @param toOnGround
* @param lastMove
* @param thisMove
* @param yDistance
* @param data
* @return vDistanceAboveLimit
*/
private double vDistClimbable(final Player player, final PlayerLocation from, final boolean fromOnGround, final boolean toOnGround, final double yDistance, final MovingData data) {
private double vDistClimbable(final Player player, final PlayerLocation from, final PlayerLocation to,
final boolean fromOnGround, final boolean toOnGround,
final PlayerMoveData thisMove, final PlayerMoveData lastMove,
final double yDistance, final MovingData data) {
double vDistanceAboveLimit = 0.0;
data.sfNoLowJump = true;
@ -1690,6 +1696,14 @@ public class SurvivalFly extends Check {
}
}
}
// Do allow friction with velocity.
if (vDistanceAboveLimit > 0.0 && data.isVelocityJumpPhase()
&& thisMove.yDistance > 0.0 && lastMove.yDistance - Magic.GRAVITY_MAX > thisMove.yDistance) {
// TODO: Actual friction or limit by absolute y-distance?
// TODO: Looks like it's only a problem when on ground?
vDistanceAboveLimit = 0.0;
tags.add("velfrict_climb");
}
// Do allow vertical velocity.
// TODO: Looks like less velocity is used here (normal hitting 0.361 of 0.462).
if (vDistanceAboveLimit > 0.0 && data.getOrUseVerticalVelocity(yDistance) != null) {