Upstream/NoCheatPlus
1
0
Fork 0
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git synced 2024-09-18 09:51:17 +02:00
Code Issues Projects Releases Wiki Activity

Adapt debug message for NoFall.

Browse Source
This commit is contained in:
asofold 2012-11-15 00:13:58 +01:00
parent 68a4145971
commit e9a3fc6974
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/fr/neatmonster/nocheatplus/checks/moving/NoFall.java
View File

@ -16,6 +16,7 @@ import fr.neatmonster.nocheatplus.actions.ParameterName;
import fr.neatmonster.nocheatplus.checks.Check; import fr.neatmonster.nocheatplus.checks.Check;
import fr.neatmonster.nocheatplus.checks.CheckType; import fr.neatmonster.nocheatplus.checks.CheckType;
import fr.neatmonster.nocheatplus.checks.ViolationData; import fr.neatmonster.nocheatplus.checks.ViolationData;
import fr.neatmonster.nocheatplus.utilities.CheckUtils;
import fr.neatmonster.nocheatplus.utilities.PlayerLocation; import fr.neatmonster.nocheatplus.utilities.PlayerLocation;
/* /*
@ -98,6 +99,8 @@ public class NoFall extends Check {
// TODO: account for player.getLocation.getY (how exactly ?) // TODO: account for player.getLocation.getY (how exactly ?)
final double yDiff = toY - fromY; final double yDiff = toY - fromY;
final double oldNFDist = data.noFallFallDistance;
// Adapt yOnGround if necessary (sf uses another setting). // Adapt yOnGround if necessary (sf uses another setting).
if (yDiff < 0) { if (yDiff < 0) {
// In fact this is somewhat heuristic, but it seems to work well. // In fact this is somewhat heuristic, but it seems to work well.
@ -139,7 +142,10 @@ public class NoFall extends Check {
} }
else if (toOnGround){ else if (toOnGround){
// Check if to deal damage. // Check if to deal damage.
if (yDiff < 0) data.noFallFallDistance -= yDiff; if (yDiff < 0){
// In this case the player has traveled further: add the difference.
data.noFallFallDistance -= yDiff;
}
if (cc.noFallDealDamage) handleOnGround(mcPlayer, data, minY, cc); if (cc.noFallDealDamage) handleOnGround(mcPlayer, data, minY, cc);
else{ else{
mcPlayer.fallDistance = Math.max(mcPlayer.fallDistance, Math.max(data.noFallFallDistance, (float) (data.noFallMaxY - minY))); mcPlayer.fallDistance = Math.max(mcPlayer.fallDistance, Math.max(data.noFallFallDistance, (float) (data.noFallMaxY - minY)));
@ -147,7 +153,7 @@ public class NoFall extends Check {
} }
} }
else{ else{
// Ensure fall distance is correct ? or anyway ! // Ensure fall distance is correct, or "anyway"?
} }
// Set reference y for nofall (always). // Set reference y for nofall (always).
@ -156,7 +162,6 @@ public class NoFall extends Check {
// TODO: fall distance might be behind (!) // TODO: fall distance might be behind (!)
// TODO: should be the data.noFallMaxY be counted in ? // TODO: should be the data.noFallMaxY be counted in ?
if (cc.debug) System.out.println(player.getName() + " NoFall: mc="+mcPlayer.fallDistance +" / nf=" + data.noFallFallDistance);
data.noFallFallDistance = Math.max(mcPlayer.fallDistance, data.noFallFallDistance); data.noFallFallDistance = Math.max(mcPlayer.fallDistance, data.noFallFallDistance);
// Add y distance. // Add y distance.
@ -164,6 +169,8 @@ public class NoFall extends Check {
data.noFallFallDistance -= yDiff; data.noFallFallDistance -= yDiff;
} }
if (cc.debug) System.out.println(player.getName() + " NoFall: mc=" + CheckUtils.fdec3.format(mcPlayer.fallDistance) +" / nf=" + CheckUtils.fdec3.format(data.noFallFallDistance) + (oldNFDist < data.noFallFallDistance ? " (+" + CheckUtils.fdec3.format(data.noFallFallDistance - oldNFDist) + ")" : ""));
} }
/** /**