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

Tweak NoFall.

Browse Source 
For maximum and minimum y also consider player.getLocation(). For the
most normal cases it does not matter, but it can matter.
This commit is contained in:
asofold 2012-11-08 18:56:25 +01:00
parent b531091e7f
commit dd74accab8
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -87,14 +87,18 @@ public class NoFall extends Check {
* the to
*/
public void check(final Player player, final PlayerLocation from, final PlayerLocation to, final MovingData data, final MovingConfig cc) {
// Reset the on ground properties only if necessary.
if (from.getY() > to.getY()){
if (from.getyOnGround() != cc.noFallyOnGround && from.getY() - from.getBlockY() < cc.noFallyOnGround)
from.setyOnGround(cc.noFallyOnGround);
if (to.getyOnGround() != cc.noFallyOnGround && to.getY() - to.getBlockY() < cc.noFallyOnGround)
to.setyOnGround(cc.noFallyOnGround);
}
final double fromY = from.getY();
final double toY = to.getY();
final double yDiff = toY - fromY;
// Adapt yOnGround if necessary (sf uses another setting).
if (yDiff < 0) {
// In fact this is somewhat heuristic, but it seems to work well.
// Missing on-ground seems to happen with running down pyramids rather.
if (from.getyOnGround() != cc.noFallyOnGround && fromY - from.getBlockY() < cc.noFallyOnGround) from.setyOnGround(cc.noFallyOnGround);
if (to.getyOnGround() != cc.noFallyOnGround && toY - to.getBlockY() < cc.noFallyOnGround) to.setyOnGround(cc.noFallyOnGround);
}
// TODO: Distinguish water depth vs. fall distance!
@ -105,18 +109,21 @@ public class NoFall extends Check {
final EntityPlayer mcPlayer = ((CraftPlayer) player).getHandle();
final double yDiff = to.getY() - from.getY();
// TODO: early returns (...)
final double pY = player.getLocation().getY();
final double minY = Math.min(fromY, Math.min(toY, pY));
if (fromReset){
// Just reset.
data.clearNoFallData();
}
else if (fromOnGround || data.noFallAssumeGround){
// Check if to deal damage (fall back damage check).
if (cc.noFallDealDamage) handleOnGround(mcPlayer, data, from.getY(), cc);
if (cc.noFallDealDamage) handleOnGround(mcPlayer, data, minY, cc);
else{
mcPlayer.fallDistance = Math.max(mcPlayer.fallDistance, Math.max(data.noFallFallDistance, (float) (data.noFallMaxY - from.getY())));
mcPlayer.fallDistance = Math.max(mcPlayer.fallDistance, Math.max(data.noFallFallDistance, (float) (data.noFallMaxY - minY)));
data.clearNoFallData();
}
}
@ -127,9 +134,9 @@ public class NoFall extends Check {
else if (toOnGround){
// Check if to deal damage.
if (yDiff < 0) data.noFallFallDistance -= yDiff;
if (cc.noFallDealDamage) handleOnGround(mcPlayer, data, to.getY(), cc);
if (cc.noFallDealDamage) handleOnGround(mcPlayer, data, minY, cc);
else{
mcPlayer.fallDistance = Math.max(mcPlayer.fallDistance, Math.max(data.noFallFallDistance, (float) (data.noFallMaxY - to.getY())));
mcPlayer.fallDistance = Math.max(mcPlayer.fallDistance, Math.max(data.noFallFallDistance, (float) (data.noFallMaxY - minY)));
data.clearNoFallData();
}
}
@ -138,7 +145,8 @@ public class NoFall extends Check {
}
// Set reference y for nofall (always).
data.noFallMaxY = Math.max(Math.max(from.getY(), to.getY()), data.noFallMaxY);
// TODO: Consider setting this before handleOnGround (at least for resetTo).
data.noFallMaxY = Math.max(Math.max(fromY, Math.max(toY, pY)), data.noFallMaxY);
// TODO: fall distance might be behind (!)
// TODO: should be the data.noFallMaxY be counted in ?