Upstream/NoCheatPlus
1
0
Fork 0
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git synced 2025-03-12 22:49:31 +01:00
Code Issues Projects Releases Wiki Activity

Move some code into a method.

Browse Source
This commit is contained in:
asofold 2016-01-03 12:41:02 +01:00
parent 5bbd22db38
commit e54d7a207e
1 changed files with 40 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,7 +46,7 @@ public class SurvivalFly extends Check {
/** Divisor vs. last hDist for minimum slow down. */
private static final double bunnyDivFriction = 160.0; // Rather in-air, blocks would differ by friction.
// TODO: Friction by block to walk on (horizontal only, possibly to be in BlockProperties rather).
@ -884,27 +884,8 @@ public class SurvivalFly extends Check {
}
}
else {
if (lastMove.valid) {
tags.add("data_reset");
}
else {
tags.add("data_missing");
}
// Teleport/join/respawn.
if (data.thisMove.from.onGround) {
vAllowedDistance = maxJumpGain + jumpGainMargin;
if (data.thisMove.to.onGround) {
vAllowedDistance = Math.max(cc.sfStepHeight, vAllowedDistance);
}
}
else if (Magic.skipPaper(data.thisMove, lastMove, data)) {
vAllowedDistance = Magic.PAPER_DIST;
tags.add("skip_paper");
}
else {
// Allow 0 y-distance once.
vAllowedDistance = 0.0;
}
vAllowedDistance = vAllowedDistanceNoData(data.thisMove, lastMove, maxJumpGain, jumpGainMargin, data, cc);
strictVdistRel = false;
}
// Compare yDistance to expected, use velocity on violation.
@ -1136,6 +1117,44 @@ public class SurvivalFly extends Check {
return new double[]{vAllowedDistance, vDistanceAboveLimit};
}
/**
* vAllowedDistance with data having been reset after teleport/join/respawn.
*
* @param thisMove
* @param lastMove
* @param maxJumpGain
* @param jumpGainMargin
* @param data
* @param cc
* @return
*/
private double vAllowedDistanceNoData(final MoveData thisMove, final MoveData lastMove,
final double maxJumpGain, final double jumpGainMargin,
final MovingData data, final MovingConfig cc) {
if (lastMove.valid) {
tags.add("data_reset");
}
else {
tags.add("data_missing");
}
double vAllowedDistance;
if (thisMove.from.onGround) {
vAllowedDistance = maxJumpGain + jumpGainMargin;
if (thisMove.to.onGround) {
vAllowedDistance = Math.max(cc.sfStepHeight, vAllowedDistance);
}
}
else if (Magic.skipPaper(thisMove, lastMove, data)) {
vAllowedDistance = Magic.PAPER_DIST;
tags.add("skip_paper");
}
else {
// Allow 0 y-distance once.
vAllowedDistance = 0.0;
}
return vAllowedDistance;
}
/**
* Extended in-air checks for vertical move: y-direction changes and accounting.
*