Upstream/NoCheatPlus
1
0
Fork 0
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git synced 2024-12-27 19:07:45 +01:00
Code Issues Projects Releases Wiki Activity

SF: Keep naming as lostGround.

Browse Source
This commit is contained in:
asofold 2013-07-20 14:24:06 +02:00
parent 2856919409
commit 2f647980c1
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -149,13 +149,15 @@ public class SurvivalFly extends Check {
// "Lost ground" workaround. // "Lost ground" workaround.
if (fromOnGround || from.isResetCond()) resetFrom = true; if (fromOnGround || from.isResetCond()) {
resetFrom = true;
}
// TODO: Extra workarounds for toOnGround ? // TODO: Extra workarounds for toOnGround ?
else{ else{
// TODO: More refined conditions possible ? // TODO: More refined conditions possible ?
// TODO: Consider if (!resetTo) ? // TODO: Consider if (!resetTo) ?
// Check lost-ground workarounds. // Check lost-ground workarounds.
resetFrom = checkLostGround(player, from, to, hDistance, yDistance, sprinting, data, cc); resetFrom = lostGround(player, from, to, hDistance, yDistance, sprinting, data, cc);
// data.stats.addStats(data.stats.getId("sfLostGround", true), resetFrom ? 1 : 0); // data.stats.addStats(data.stats.getId("sfLostGround", true), resetFrom ? 1 : 0);
// Note: if not setting resetFrom, other places have to check assumeGround... // Note: if not setting resetFrom, other places have to check assumeGround...
} }
@ -565,7 +567,7 @@ public class SurvivalFly extends Check {
* @param cc * @param cc
* @return If touching the ground was lost. * @return If touching the ground was lost.
*/ */
private boolean checkLostGround(final Player player, final PlayerLocation from, final PlayerLocation to, final double hDistance, final double yDistance, final boolean sprinting, final MovingData data, final MovingConfig cc) { private boolean lostGround(final Player player, final PlayerLocation from, final PlayerLocation to, final double hDistance, final double yDistance, final boolean sprinting, final MovingData data, final MovingConfig cc) {
// TODO: Confine by max y distance and max/min xz-distance? // TODO: Confine by max y distance and max/min xz-distance?
if (yDistance >= -0.5 && yDistance <= 0.52 + data.jumpAmplifier * 0.2){ if (yDistance >= -0.5 && yDistance <= 0.52 + data.jumpAmplifier * 0.2){
// "Mild" Ascending / descending. // "Mild" Ascending / descending.
@ -623,12 +625,13 @@ public class SurvivalFly extends Check {
// Currently only for "air" phases. // Currently only for "air" phases.
// Vertical. // Vertical.
if (yDirChange && data.sfLastYDist > 0){ if (yDirChange && data.sfLastYDist > 0){
// Change to descending phase ! // Change to descending phase.
data.vDistAcc.clear(); data.vDistAcc.clear();
// Allow adding 0.
data.vDistAcc.add((float) yDistance); data.vDistAcc.add((float) yDistance);
} }
else if (data.verticalFreedom <= 0.001D) { else if (data.verticalFreedom <= 0.001D) {
// Here yDistance can be negative and positive (!). // Here yDistance can be negative and positive.
if (yDistance != 0D){ if (yDistance != 0D){
data.vDistAcc.add((float) yDistance); data.vDistAcc.add((float) yDistance);
final double accAboveLimit = verticalAccounting(yDistance, data.vDistAcc ,tags, "vacc"); final double accAboveLimit = verticalAccounting(yDistance, data.vDistAcc ,tags, "vacc");
@ -720,7 +723,7 @@ public class SurvivalFly extends Check {
* @return vDistanceAboveLimit * @return vDistanceAboveLimit
*/ */
private double yDirChange(final PlayerLocation from, final PlayerLocation to, final double yDistance, double vDistanceAboveLimit, final MovingData data) { private double yDirChange(final PlayerLocation from, final PlayerLocation to, final double yDistance, double vDistanceAboveLimit, final MovingData data) {
// TODO: account for velocity, // TODO: Does this account for velocity in a sufficient way?
if (yDistance > 0){ if (yDistance > 0){
// Increase // Increase
if (data.toWasReset){ if (data.toWasReset){