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

Move lost ground code to magic.LostGround.

Browse Source
This commit is contained in:
asofold 2016-03-20 23:48:21 +01:00
parent 27abbfc25f
commit b131750bc7
4 changed files with 432 additions and 388 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,6 @@ import java.util.Locale;
import java.util.Set; import java.util.Set;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause; import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
import org.bukkit.potion.PotionEffectType; import org.bukkit.potion.PotionEffectType;
@ -16,11 +15,13 @@ 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.checks.moving.magic.LostGround;
import fr.neatmonster.nocheatplus.checks.moving.magic.Magic; import fr.neatmonster.nocheatplus.checks.moving.magic.Magic;
import fr.neatmonster.nocheatplus.checks.moving.magic.MagicAir; import fr.neatmonster.nocheatplus.checks.moving.magic.MagicAir;
import fr.neatmonster.nocheatplus.checks.moving.magic.MagicLiquid; import fr.neatmonster.nocheatplus.checks.moving.magic.MagicLiquid;
import fr.neatmonster.nocheatplus.checks.moving.model.LiftOffEnvelope; import fr.neatmonster.nocheatplus.checks.moving.model.LiftOffEnvelope;
import fr.neatmonster.nocheatplus.checks.moving.model.MoveData; import fr.neatmonster.nocheatplus.checks.moving.model.MoveData;
import fr.neatmonster.nocheatplus.checks.moving.util.MovingUtil;
import fr.neatmonster.nocheatplus.checks.workaround.WRPT; import fr.neatmonster.nocheatplus.checks.workaround.WRPT;
import fr.neatmonster.nocheatplus.compat.Bridge1_9; import fr.neatmonster.nocheatplus.compat.Bridge1_9;
import fr.neatmonster.nocheatplus.compat.BridgeEnchant; import fr.neatmonster.nocheatplus.compat.BridgeEnchant;
@ -28,7 +29,6 @@ import fr.neatmonster.nocheatplus.compat.blocks.BlockChangeTracker;
import fr.neatmonster.nocheatplus.compat.blocks.BlockChangeTracker.Direction; import fr.neatmonster.nocheatplus.compat.blocks.BlockChangeTracker.Direction;
import fr.neatmonster.nocheatplus.logging.Streams; import fr.neatmonster.nocheatplus.logging.Streams;
import fr.neatmonster.nocheatplus.permissions.Permissions; import fr.neatmonster.nocheatplus.permissions.Permissions;
import fr.neatmonster.nocheatplus.utilities.BlockCache;
import fr.neatmonster.nocheatplus.utilities.BlockProperties; import fr.neatmonster.nocheatplus.utilities.BlockProperties;
import fr.neatmonster.nocheatplus.utilities.CheckUtils; import fr.neatmonster.nocheatplus.utilities.CheckUtils;
import fr.neatmonster.nocheatplus.utilities.PlayerLocation; import fr.neatmonster.nocheatplus.utilities.PlayerLocation;
@ -180,7 +180,7 @@ public class SurvivalFly extends Check {
// TODO: This isn't correct, needs redesign. // TODO: This isn't correct, needs redesign.
if (lastMove.toIsValid && lastMove.hDistance > 0.0 && lastMove.yDistance < -0.3) { if (lastMove.toIsValid && lastMove.hDistance > 0.0 && lastMove.yDistance < -0.3) {
// Note that to is not on ground either. // Note that to is not on ground either.
resetFrom = lostGroundStill(player, from, to, hDistance, yDistance, sprinting, lastMove, data, cc); resetFrom = LostGround.lostGroundStill(player, from, to, hDistance, yDistance, sprinting, lastMove, data, cc, tags);
} else { } else {
resetFrom = false; resetFrom = false;
} }
@ -190,7 +190,7 @@ public class SurvivalFly extends Check {
// 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 = lostGround(player, from, to, hDistance, yDistance, sprinting, lastMove, data, cc); resetFrom = LostGround.lostGround(player, from, to, hDistance, yDistance, sprinting, lastMove, data, cc, tags);
// Note: if not setting resetFrom, other places have to check assumeGround... // Note: if not setting resetFrom, other places have to check assumeGround...
} }
@ -732,19 +732,19 @@ public class SurvivalFly extends Check {
// TODO: Friction model for high speeds? // TODO: Friction model for high speeds?
hAllowedDistance = Math.max(hAllowedDistance, lastMove.hDistance * friction); hAllowedDistance = Math.max(hAllowedDistance, lastMove.hDistance * friction);
} }
// if (hAllowedDistance < thisMove.hDistance) { // if (hAllowedDistance < thisMove.hDistance) {
// // After failure recovery. // // After failure recovery.
// if (lastMove.toIsValid) { // if (lastMove.toIsValid) {
// final double hDistDiff = thisMove.hDistance - lastMove.hDistance; // final double hDistDiff = thisMove.hDistance - lastMove.hDistance;
// // Elytra. // // Elytra.
// if (hDistDiff < Magic.GLIDE_HORIZONTAL_GAIN_MAX // if (hDistDiff < Magic.GLIDE_HORIZONTAL_GAIN_MAX
// && Magic.inAir(thisMove) && Bridge1_9.isWearingElytra(player)) { // && Magic.inAir(thisMove) && Bridge1_9.isWearingElytra(player)) {
// // (Abrupt hdist stops aren't covered yet anyway.) // // (Abrupt hdist stops aren't covered yet anyway.)
// hAllowedDistance = thisMove.hDistance; // hAllowedDistance = thisMove.hDistance;
// data.nextFrictionHorizontal = Magic.FRICTION_MEDIUM_AIR; // data.nextFrictionHorizontal = Magic.FRICTION_MEDIUM_AIR;
// } // }
// } // }
// } // }
thisMove.hAllowedDistance = hAllowedDistance; thisMove.hAllowedDistance = hAllowedDistance;
return thisMove.hAllowedDistance; return thisMove.hAllowedDistance;
} }
@ -772,49 +772,6 @@ public class SurvivalFly extends Check {
return reallySneaking.contains(player.getName()); return reallySneaking.contains(player.getName());
} }
/**
* Check if touching the ground was lost (client did not send, or server did not put it through).
* @param player
* @param from
* @param to
* @param hDistance
* @param yDistance
* @param sprinting
* @param data
* @param cc
* @return If touching the ground was lost.
*/
private boolean lostGround(final Player player, final PlayerLocation from, final PlayerLocation to, final double hDistance, final double yDistance, final boolean sprinting, final MoveData lastMove, final MovingData data, final MovingConfig cc) {
// TODO: Regroup with appropriate conditions (toOnGround first?).
// TODO: Some workarounds allow step height (0.6 on MC 1.8).
// TODO: yDistance limit does not seem to be appropriate.
if (yDistance >= -0.7 && yDistance <= Math.max(cc.sfStepHeight, LiftOffEnvelope.NORMAL.getMaxJumpGain(data.jumpAmplifier) + 0.174)) { // MovingUtil.estimateJumpLiftOff(player, data, 0.174))) {
// "Mild" Ascending / descending.
//Ascending
if (yDistance >= 0) {
if (lastMove.toIsValid && lostGroundAscend(player, from, to, hDistance, yDistance, sprinting, lastMove, data, cc)) {
return true;
}
}
// Descending.
if (yDistance <= 0) {
if (lostGroundDescend(player, from, to, hDistance, yDistance, sprinting, lastMove, data, cc)) {
return true;
}
}
}
else if (yDistance < -0.7) {
// Clearly descending.
// TODO: Might want to remove this one.
if (lastMove.toIsValid && hDistance <= 0.5) {
if (lostGroundFastDescend(player, from, to, hDistance, yDistance, sprinting, lastMove, data, cc)) {
return true;
}
}
}
return false;
}
/** /**
* Core y-distance checks for in-air movement (may include air -> other). * Core y-distance checks for in-air movement (may include air -> other).
* @return * @return
@ -1718,331 +1675,6 @@ public class SurvivalFly extends Check {
return new double[]{vAllowedDistance, vDistanceAboveLimit}; return new double[]{vAllowedDistance, vDistanceAboveLimit};
} }
/**
* Check if a ground-touch has been lost due to event-sending-frequency or other reasons.<br>
* This is for ascending only (yDistance >= 0). Needs last move data.
* @param player
* @param from
* @param loc
* @param to
* @param hDistance
* @param yDistance
* @param sprinting
* @param data
* @param cc
* @return
*/
private boolean lostGroundAscend(final Player player, final PlayerLocation from, final PlayerLocation to, final double hDistance, final double yDistance, final boolean sprinting, final MoveData lastMove, final MovingData data, final MovingConfig cc) {
final double setBackYDistance = to.getY() - data.getSetBackY();
// Step height related.
// TODO: Combine / refine preconditions for step height related.
// TODO: || yDistance <= jump estimate?
if (yDistance <= cc.sfStepHeight && hDistance <= 1.5) { // hDistance is arbitrary, just to confine.
// Half block step up (definitive).
// TODO: && hDistance < 0.5 ~ switch to about 2.2 * baseSpeed once available.
if (setBackYDistance <= Math.max(0.0, 1.3 + 0.2 * data.jumpAmplifier) && to.isOnGround()) {
// TODO: hDistance > 0.0
if (lastMove.yDistance < 0.0 || yDistance <= cc.sfStepHeight && from.isOnGround(cc.sfStepHeight - yDistance)) {
return applyLostGround(player, from, true, data, "step");
}
}
// Could step up (but might move to another direction, potentially).
if (lastMove.yDistance < 0.0) { // TODO: <= ?
// Generic could step.
// TODO: Possibly confine margin depending on side, moving direction (see client code).
// TODO: Should this also be checked vs. last from?
if (BlockProperties.isOnGroundShuffled(to.getBlockCache(), from.getX(), from.getY() + cc.sfStepHeight, from.getZ(), to.getX(), to.getY(), to.getZ(), 0.1 + (double) Math.round(from.getWidth() * 500.0) / 1000.0, to.getyOnGround(), 0.0)) {
// TODO: Set a data property, so vdist does not trigger (currently: scan for tag)
// TODO: !to.isOnGround?
return applyLostGround(player, from, false, data, "couldstep");
}
// Close by ground miss (client side blocks y move, but allows h move fully/mostly, missing the edge on server side).
// Possibly confine by more criteria.
if (!to.isOnGround()) { // TODO: Note, that there may be cases with to on ground (!).
// (Use covered area to last from.)
// TODO: Plausible: last to is about this from?
// TODO: Otherwise cap max. amount (seems not really possible, could confine by passable checking).
// TODO: Might estimate by the yDist from before last from (cap x2 and y2).
// TODO: A ray-tracing version of isOnground?
if (lostGroundEdgeAsc(player, from.getBlockCache(), from.getWorld(), from.getX(), from.getY(), from.getZ(), from.getWidth(), from.getyOnGround(), lastMove, data, "asc1")) {
return true;
}
// Special cases.
if (yDistance == 0.0 && lastMove.yDistance <= -0.23 && (hDistance <= lastMove.hDistance * 1.1)) {
// Similar to couldstep, with 0 y-distance but slightly above any ground nearby (no micro move!).
// TODO: (hDistance <= data.sfLastHDist || hDistance <= hDistanceBaseRef)
// TODO: Confining in x/z direction in general: should detect if collided in that direction (then skip the x/z dist <= last time).
// TODO: Temporary test (should probably be covered by one of the above instead).
// TODO: Code duplication with edgeasc7 below.
if (lostGroundEdgeAsc(player, from.getBlockCache(), to.getWorld(), to.getX(), to.getY(), to.getZ(), from.getX(), from.getY(), from.getZ(), hDistance, to.getWidth(), 0.3, data, "asc5")) {
return true;
}
}
else if (from.isOnGround(from.getyOnGround(), 0.0625, 0.0)) {
// (Minimal margin.)
//data.sfLastAllowBunny = true; // TODO: Maybe a less powerful flag (just skipping what is necessary).
return applyLostGround(player, from, false, data, "edgeasc2"); // Maybe true ?
}
}
}
}
// Nothing found.
return false;
}
/**
* Preconditions move dist is 0, not on ground, last h dist > 0, last y dist
* < 0. Needs last move data.
*
* @param player
* @param from
* @param loc
* @param to
* @param hDistance
* @param yDistance
* @param sprinting
* @param data
* @param cc
* @return
*/
private boolean lostGroundStill(final Player player, final PlayerLocation from, final PlayerLocation to, final double hDistance, final double yDistance, final boolean sprinting, final MoveData lastMove, final MovingData data, final MovingConfig cc) {
if (lastMove.yDistance <= -0.23) {
// TODO: Code duplication with edgeasc5 above.
if (lostGroundEdgeAsc(player, from.getBlockCache(), to.getWorld(), to.getX(), to.getY(), to.getZ(), from.getX(), from.getY(), from.getZ(), hDistance, to.getWidth(), 0.3, data, "asc7")) {
return true;
}
}
return false;
}
/**
* Vertical collision with ground on client side, shifting over an edge with
* the horizontal move. Needs last move data.
*
* @param player
* @param blockCache
* @param world
* @param x1
* Target position.
* @param y1
* @param z1
* @param width
* @param yOnGround
* @param data
* @param tag
* @return
*/
private boolean lostGroundEdgeAsc(final Player player, final BlockCache blockCache, final World world, final double x1, final double y1, final double z1, final double width, final double yOnGround, final MoveData lastMove, final MovingData data, final String tag) {
return lostGroundEdgeAsc(player, blockCache, world, x1, y1, z1, lastMove.from.x, lastMove.from.y, lastMove.from.z, lastMove.hDistance, width, yOnGround, data, tag);
}
private boolean lostGroundEdgeAsc(final Player player, final BlockCache blockCache, final World world, final double x1, final double y1, final double z1, double x2, final double y2, double z2, final double hDistance2, final double width, final double yOnGround, final MovingData data, final String tag) {
// First: calculate vector towards last from.
x2 -= x1;
z2 -= z1;
// double y2 = data.fromY - y1; // Just for consistency checks (lastYDist).
// Second: cap the size of the extra box (at least horizontal).
double fMin = 1.0; // Factor for capping.
if (Math.abs(x2) > hDistance2) {
fMin = Math.min(fMin, hDistance2 / Math.abs(x2));
}
if (Math.abs(z2) > hDistance2) {
fMin = Math.min(fMin, hDistance2 / Math.abs(z2));
}
// TODO: Further / more precise ?
// Third: calculate end points.
x2 = fMin * x2 + x1;
z2 = fMin * z2 + z1;
// Finally test for ground.
final double xzMargin = Math.round(width * 500.0) / 1000.0; // Bounding box "radius" at some resolution.
// (We don't add another xz-margin here, as the move should cover ground.)
if (BlockProperties.isOnGroundShuffled(blockCache, x1, y1, z1, x2, y1, z2, xzMargin, yOnGround, 0.0)) {
//data.sfLastAllowBunny = true; // TODO: Maybe a less powerful flag (just skipping what is necessary).
// TODO: data.fromY for set back is not correct, but currently it is more safe (needs instead: maintain a "distance to ground").
return applyLostGround(player, new Location(world, x2, y2, z2), true, data, "edge" + tag); // Maybe true ?
} else {
return false;
}
}
/**
* Check if a ground-touch has been lost due to event-sending-frequency or
* other reasons.<br>
* This is for descending "mildly" only (-0.5 <= yDistance <= 0). Needs last
* move data.
*
* @param player
* @param from
* @param to
* @param hDistance
* @param yDistance
* @param sprinting
* @param data
* @param cc
* @return
*/
private boolean lostGroundDescend(final Player player, final PlayerLocation from, final PlayerLocation to, final double hDistance, final double yDistance, final boolean sprinting, final MoveData lastMove, final MovingData data, final MovingConfig cc) {
// TODO: re-organize for faster exclusions (hDistance, yDistance).
// TODO: more strict conditions
final double setBackYDistance = to.getY() - data.getSetBackY();
// Collides vertically.
// Note: checking loc should make sense, rather if loc is higher than from?
if (yDistance < 0.0 && !to.isOnGround() && from.isOnGround(from.getY() - to.getY() + 0.001)) {
// Test for passability of the entire box, roughly from feet downwards.
// TODO: Efficiency with Location instances.
// TODO: Full bounds check (!).
final Location ref = from.getLocation();
ref.setY(to.getY());
if (BlockProperties.isPassable(from.getLocation(), ref)) {
// TODO: Needs new model (store detailed on-ground properties).
return applyLostGround(player, from, false, data, "vcollide");
}
}
if (!lastMove.toIsValid) {
return false;
}
if (data.sfJumpPhase <= 7) {
// Check for sprinting down blocks etc.
if (lastMove.yDistance <= yDistance && setBackYDistance < 0 && !to.isOnGround()) {
// TODO: setbackydist: <= - 1.0 or similar
// TODO: <= 7 might work with speed II, not sure with above.
// TODO: account for speed/sprint
// TODO: account for half steps !?
if (from.isOnGround(0.6, 0.4, 0.0, 0L) ) {
// TODO: further narrow down bounds ?
// Temporary "fix".
// TODO: Seems to virtually always be preceded by a "vcollide" move.
return applyLostGround(player, from, true, data, "pyramid");
}
}
// Check for jumping up strange blocks like flower pots on top of other blocks.
if (yDistance == 0.0 && lastMove.yDistance > 0.0 && lastMove.yDistance < 0.25 && data.sfJumpPhase <= Math.max(0, 6 + data.jumpAmplifier * 3.0) && setBackYDistance > 1.0 && setBackYDistance < Math.max(0.0, 1.5 + 0.2 * data.jumpAmplifier) && !to.isOnGround()) {
// TODO: confine by block types ?
if (from.isOnGround(0.25, 0.4, 0, 0L) ) {
// Temporary "fix".
//data.sfThisAllowBunny = true;
return applyLostGround(player, from, true, data, "ministep");
}
}
}
// Lost ground while falling onto/over edges of blocks.
if (yDistance < 0 && hDistance <= 1.5 && lastMove.yDistance < 0.0 && yDistance > lastMove.yDistance && !to.isOnGround()) {
// TODO: Should this be an extra lost-ground(to) check, setting toOnGround [for no-fall no difference]?
// TODO: yDistance <= 0 might be better.
// Also clear accounting data.
// if (to.isOnGround(0.5) || from.isOnGround(0.5)) {
if (from.isOnGround(0.5, 0.2, 0) || to.isOnGround(0.5, Math.min(0.2, 0.01 + hDistance), Math.min(0.1, 0.01 + -yDistance))) {
return applyLostGround(player, from, true, data, "edgedesc");
}
}
// Nothing found.
return false;
}
/**
* Check if a ground-touch has been lost due to event-sending-frequency or
* other reasons.<br>
* This is for fast descending only (yDistance < -0.5). Needs last move
* data.
*
* @param player
* @param from
* @param to
* @param hDistance
* @param yDistance
* @param sprinting
* @param data
* @param cc
* @return
*/
private boolean lostGroundFastDescend(final Player player, final PlayerLocation from, final PlayerLocation to, final double hDistance, final double yDistance, final boolean sprinting, final MoveData lastMove, final MovingData data, final MovingConfig cc) {
// TODO: re-organize for faster exclusions (hDistance, yDistance).
// TODO: more strict conditions
// Lost ground while falling onto/over edges of blocks.
if (yDistance > lastMove.yDistance && !to.isOnGround()) {
// TODO: Should this be an extra lost-ground(to) check, setting toOnGround [for no-fall no difference]?
// TODO: yDistance <= 0 might be better.
// Also clear accounting data.
// TODO: stairs ?
// TODO: Can it be safe to only check to with raised margin ? [in fact should be checked from higher yMin down]
// TODO: Interpolation method (from to)?
if (from.isOnGround(0.5, 0.2, 0) || to.isOnGround(0.5, Math.min(0.3, 0.01 + hDistance), Math.min(0.1, 0.01 + -yDistance))) {
// (Usually yDistance should be -0.078)
return applyLostGround(player, from, true, data, "fastedge");
}
}
return false;
}
/**
* Apply lost-ground workaround.
* @param player
* @param refLoc
* @param setBackSafe If to use the given location as set-back.
* @param data
* @param tag Added to "lostground_" as tag.
* @return Always true.
*/
private boolean applyLostGround(final Player player, final Location refLoc, final boolean setBackSafe, final MovingData data, final String tag) {
if (setBackSafe) {
data.setSetBack(refLoc);
}
else {
// Keep Set-back.
}
return applyLostGround(player, data, tag);
}
/**
* Apply lost-ground workaround.
* @param player
* @param refLoc
* @param setBackSafe If to use the given location as set-back.
* @param data
* @param tag Added to "lostground_" as tag.
* @return Always true.
*/
private boolean applyLostGround(final Player player, final PlayerLocation refLoc, final boolean setBackSafe, final MovingData data, final String tag) {
// Set the new setBack and reset the jumpPhase.
if (setBackSafe) {
data.setSetBack(refLoc);
}
else {
// Keep Set-back.
}
return applyLostGround(player, data, tag);
}
/**
* Apply lost-ground workaround (data adjustments and tag).
* @param player
* @param refLoc
* @param setBackSafe If to use the given location as set-back.
* @param data
* @param tag Added to "lostground_" as tag.
* @return Always true.
*/
private boolean applyLostGround(final Player player, final MovingData data, final String tag) {
// Reset the jumpPhase.
// ? set jumpphase to 1 / other, depending on stuff ?
data.sfJumpPhase = 0;
data.jumpAmplifier = getJumpAmplifier(player);
data.clearAccounting();
// Tell NoFall that we assume the player to have been on ground somehow.
data.thisMove.touchedGround = true;
data.thisMove.touchedGroundWorkaround = true;
tags.add("lostground_" + tag);
return true;
}
/** /**
* Violation handling put here to have less code for the frequent processing of check. * Violation handling put here to have less code for the frequent processing of check.
* @param now * @param now
@ -2166,9 +1798,7 @@ public class SurvivalFly extends Check {
* @return * @return
*/ */
protected final double getJumpAmplifier(final Player player) { protected final double getJumpAmplifier(final Player player) {
final double amplifier = mcAccess.getJumpAmplifier(player); return MovingUtil.getJumpAmplifier(player, mcAccess);
if (amplifier == Double.NEGATIVE_INFINITY) return 0D;
else return 1D + amplifier;
} }
/** /**

395
NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/moving/magic/LostGround.java Normal file
View File

@ -0,0 +1,395 @@
package fr.neatmonster.nocheatplus.checks.moving.magic;
import java.util.Collection;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.entity.Player;
import fr.neatmonster.nocheatplus.checks.moving.MovingConfig;
import fr.neatmonster.nocheatplus.checks.moving.MovingData;
import fr.neatmonster.nocheatplus.checks.moving.model.LiftOffEnvelope;
import fr.neatmonster.nocheatplus.checks.moving.model.MoveData;
import fr.neatmonster.nocheatplus.checks.moving.util.MovingUtil;
import fr.neatmonster.nocheatplus.compat.MCAccess;
import fr.neatmonster.nocheatplus.utilities.BlockCache;
import fr.neatmonster.nocheatplus.utilities.BlockProperties;
import fr.neatmonster.nocheatplus.utilities.PlayerLocation;
/**
* Lost ground workarounds.
*
* @author asofold
*
*/
public class LostGround {
/**
* Check if touching the ground was lost (client did not send, or server did not put it through).
* @param player
* @param from
* @param to
* @param hDistance
* @param yDistance
* @param sprinting
* @param data
* @param cc
* @return If touching the ground was lost.
*/
public static boolean lostGround(final Player player, final PlayerLocation from, final PlayerLocation to, final double hDistance, final double yDistance, final boolean sprinting, final MoveData lastMove, final MovingData data, final MovingConfig cc, final Collection<String> tags) {
// TODO: Regroup with appropriate conditions (toOnGround first?).
// TODO: Some workarounds allow step height (0.6 on MC 1.8).
// TODO: yDistance limit does not seem to be appropriate.
if (yDistance >= -0.7 && yDistance <= Math.max(cc.sfStepHeight, LiftOffEnvelope.NORMAL.getMaxJumpGain(data.jumpAmplifier) + 0.174)) { // MovingUtil.estimateJumpLiftOff(player, data, 0.174))) {
// "Mild" Ascending / descending.
//Ascending
if (yDistance >= 0) {
if (lastMove.toIsValid && lostGroundAscend(player, from, to, hDistance, yDistance, sprinting, lastMove, data, cc, tags)) {
return true;
}
}
// Descending.
if (yDistance <= 0) {
if (lostGroundDescend(player, from, to, hDistance, yDistance, sprinting, lastMove, data, cc, tags)) {
return true;
}
}
}
else if (yDistance < -0.7) {
// Clearly descending.
// TODO: Might want to remove this one.
if (lastMove.toIsValid && hDistance <= 0.5) {
if (lostGroundFastDescend(player, from, to, hDistance, yDistance, sprinting, lastMove, data, cc, tags)) {
return true;
}
}
}
return false;
}
/**
* Check if a ground-touch has been lost due to event-sending-frequency or other reasons.<br>
* This is for ascending only (yDistance >= 0). Needs last move data.
* @param player
* @param from
* @param loc
* @param to
* @param hDistance
* @param yDistance
* @param sprinting
* @param data
* @param cc
* @return
*/
private static boolean lostGroundAscend(final Player player, final PlayerLocation from, final PlayerLocation to, final double hDistance, final double yDistance, final boolean sprinting, final MoveData lastMove, final MovingData data, final MovingConfig cc, final Collection<String> tags) {
final double setBackYDistance = to.getY() - data.getSetBackY();
// Step height related.
// TODO: Combine / refine preconditions for step height related.
// TODO: || yDistance <= jump estimate?
if (yDistance <= cc.sfStepHeight && hDistance <= 1.5) { // hDistance is arbitrary, just to confine.
// Half block step up (definitive).
// TODO: && hDistance < 0.5 ~ switch to about 2.2 * baseSpeed once available.
if (setBackYDistance <= Math.max(0.0, 1.3 + 0.2 * data.jumpAmplifier) && to.isOnGround()) {
// TODO: hDistance > 0.0
if (lastMove.yDistance < 0.0 || yDistance <= cc.sfStepHeight && from.isOnGround(cc.sfStepHeight - yDistance)) {
return applyLostGround(player, from, true, data, "step", tags);
}
}
// Could step up (but might move to another direction, potentially).
if (lastMove.yDistance < 0.0) { // TODO: <= ?
// Generic could step.
// TODO: Possibly confine margin depending on side, moving direction (see client code).
// TODO: Should this also be checked vs. last from?
if (BlockProperties.isOnGroundShuffled(to.getBlockCache(), from.getX(), from.getY() + cc.sfStepHeight, from.getZ(), to.getX(), to.getY(), to.getZ(), 0.1 + (double) Math.round(from.getWidth() * 500.0) / 1000.0, to.getyOnGround(), 0.0)) {
// TODO: Set a data property, so vdist does not trigger (currently: scan for tag)
// TODO: !to.isOnGround?
return applyLostGround(player, from, false, data, "couldstep", tags);
}
// Close by ground miss (client side blocks y move, but allows h move fully/mostly, missing the edge on server side).
// Possibly confine by more criteria.
if (!to.isOnGround()) { // TODO: Note, that there may be cases with to on ground (!).
// (Use covered area to last from.)
// TODO: Plausible: last to is about this from?
// TODO: Otherwise cap max. amount (seems not really possible, could confine by passable checking).
// TODO: Might estimate by the yDist from before last from (cap x2 and y2).
// TODO: A ray-tracing version of isOnground?
if (lostGroundEdgeAsc(player, from.getBlockCache(), from.getWorld(), from.getX(), from.getY(), from.getZ(), from.getWidth(), from.getyOnGround(), lastMove, data, "asc1", tags, from.getMCAccess())) {
return true;
}
// Special cases.
if (yDistance == 0.0 && lastMove.yDistance <= -0.23 && (hDistance <= lastMove.hDistance * 1.1)) {
// Similar to couldstep, with 0 y-distance but slightly above any ground nearby (no micro move!).
// TODO: (hDistance <= data.sfLastHDist || hDistance <= hDistanceBaseRef)
// TODO: Confining in x/z direction in general: should detect if collided in that direction (then skip the x/z dist <= last time).
// TODO: Temporary test (should probably be covered by one of the above instead).
// TODO: Code duplication with edgeasc7 below.
if (lostGroundEdgeAsc(player, from.getBlockCache(), to.getWorld(), to.getX(), to.getY(), to.getZ(), from.getX(), from.getY(), from.getZ(), hDistance, to.getWidth(), 0.3, data, "asc5", tags, from.getMCAccess())) {
return true;
}
}
else if (from.isOnGround(from.getyOnGround(), 0.0625, 0.0)) {
// (Minimal margin.)
//data.sfLastAllowBunny = true; // TODO: Maybe a less powerful flag (just skipping what is necessary).
return applyLostGround(player, from, false, data, "edgeasc2", tags); // Maybe true ?
}
}
}
}
// Nothing found.
return false;
}
/**
* Preconditions move dist is 0, not on ground, last h dist > 0, last y dist
* < 0. Needs last move data.
*
* @param player
* @param from
* @param loc
* @param to
* @param hDistance
* @param yDistance
* @param sprinting
* @param data
* @param cc
* @return
*/
public static boolean lostGroundStill(final Player player, final PlayerLocation from, final PlayerLocation to, final double hDistance, final double yDistance, final boolean sprinting, final MoveData lastMove, final MovingData data, final MovingConfig cc, final Collection<String> tags) {
if (lastMove.yDistance <= -0.23) {
// TODO: Code duplication with edgeasc5 above.
if (lostGroundEdgeAsc(player, from.getBlockCache(), to.getWorld(), to.getX(), to.getY(), to.getZ(), from.getX(), from.getY(), from.getZ(), hDistance, to.getWidth(), 0.3, data, "asc7", tags, from.getMCAccess())) {
return true;
}
}
return false;
}
/**
* Vertical collision with ground on client side, shifting over an edge with
* the horizontal move. Needs last move data.
*
* @param player
* @param blockCache
* @param world
* @param x1
* Target position.
* @param y1
* @param z1
* @param width
* @param yOnGround
* @param data
* @param tag
* @return
*/
public static boolean lostGroundEdgeAsc(final Player player, final BlockCache blockCache, final World world, final double x1, final double y1, final double z1, final double width, final double yOnGround, final MoveData lastMove, final MovingData data, final String tag, final Collection<String> tags, final MCAccess mcAccess) {
return lostGroundEdgeAsc(player, blockCache, world, x1, y1, z1, lastMove.from.x, lastMove.from.y, lastMove.from.z, lastMove.hDistance, width, yOnGround, data, tag, tags, mcAccess);
}
private static boolean lostGroundEdgeAsc(final Player player, final BlockCache blockCache, final World world, final double x1, final double y1, final double z1, double x2, final double y2, double z2, final double hDistance2, final double width, final double yOnGround, final MovingData data, final String tag, final Collection<String> tags, final MCAccess mcAccess) {
// First: calculate vector towards last from.
x2 -= x1;
z2 -= z1;
// double y2 = data.fromY - y1; // Just for consistency checks (lastYDist).
// Second: cap the size of the extra box (at least horizontal).
double fMin = 1.0; // Factor for capping.
if (Math.abs(x2) > hDistance2) {
fMin = Math.min(fMin, hDistance2 / Math.abs(x2));
}
if (Math.abs(z2) > hDistance2) {
fMin = Math.min(fMin, hDistance2 / Math.abs(z2));
}
// TODO: Further / more precise ?
// Third: calculate end points.
x2 = fMin * x2 + x1;
z2 = fMin * z2 + z1;
// Finally test for ground.
final double xzMargin = Math.round(width * 500.0) / 1000.0; // Bounding box "radius" at some resolution.
// (We don't add another xz-margin here, as the move should cover ground.)
if (BlockProperties.isOnGroundShuffled(blockCache, x1, y1, z1, x2, y1, z2, xzMargin, yOnGround, 0.0)) {
//data.sfLastAllowBunny = true; // TODO: Maybe a less powerful flag (just skipping what is necessary).
// TODO: data.fromY for set back is not correct, but currently it is more safe (needs instead: maintain a "distance to ground").
return applyLostGround(player, new Location(world, x2, y2, z2), true, data, "edge" + tag, tags, mcAccess); // Maybe true ?
} else {
return false;
}
}
/**
* Check if a ground-touch has been lost due to event-sending-frequency or
* other reasons.<br>
* This is for descending "mildly" only (-0.5 <= yDistance <= 0). Needs last
* move data.
*
* @param player
* @param from
* @param to
* @param hDistance
* @param yDistance
* @param sprinting
* @param data
* @param cc
* @return
*/
private static boolean lostGroundDescend(final Player player, final PlayerLocation from, final PlayerLocation to, final double hDistance, final double yDistance, final boolean sprinting, final MoveData lastMove, final MovingData data, final MovingConfig cc, final Collection<String> tags) {
// TODO: re-organize for faster exclusions (hDistance, yDistance).
// TODO: more strict conditions
final double setBackYDistance = to.getY() - data.getSetBackY();
// Collides vertically.
// Note: checking loc should make sense, rather if loc is higher than from?
if (yDistance < 0.0 && !to.isOnGround() && from.isOnGround(from.getY() - to.getY() + 0.001)) {
// Test for passability of the entire box, roughly from feet downwards.
// TODO: Efficiency with Location instances.
// TODO: Full bounds check (!).
final Location ref = from.getLocation();
ref.setY(to.getY());
if (BlockProperties.isPassable(from.getLocation(), ref)) {
// TODO: Needs new model (store detailed on-ground properties).
return applyLostGround(player, from, false, data, "vcollide", tags);
}
}
if (!lastMove.toIsValid) {
return false;
}
if (data.sfJumpPhase <= 7) {
// Check for sprinting down blocks etc.
if (lastMove.yDistance <= yDistance && setBackYDistance < 0 && !to.isOnGround()) {
// TODO: setbackydist: <= - 1.0 or similar
// TODO: <= 7 might work with speed II, not sure with above.
// TODO: account for speed/sprint
// TODO: account for half steps !?
if (from.isOnGround(0.6, 0.4, 0.0, 0L) ) {
// TODO: further narrow down bounds ?
// Temporary "fix".
// TODO: Seems to virtually always be preceded by a "vcollide" move.
return applyLostGround(player, from, true, data, "pyramid", tags);
}
}
// Check for jumping up strange blocks like flower pots on top of other blocks.
if (yDistance == 0.0 && lastMove.yDistance > 0.0 && lastMove.yDistance < 0.25 && data.sfJumpPhase <= Math.max(0, 6 + data.jumpAmplifier * 3.0) && setBackYDistance > 1.0 && setBackYDistance < Math.max(0.0, 1.5 + 0.2 * data.jumpAmplifier) && !to.isOnGround()) {
// TODO: confine by block types ?
if (from.isOnGround(0.25, 0.4, 0, 0L) ) {
// Temporary "fix".
//data.sfThisAllowBunny = true;
return applyLostGround(player, from, true, data, "ministep", tags);
}
}
}
// Lost ground while falling onto/over edges of blocks.
if (yDistance < 0 && hDistance <= 1.5 && lastMove.yDistance < 0.0 && yDistance > lastMove.yDistance && !to.isOnGround()) {
// TODO: Should this be an extra lost-ground(to) check, setting toOnGround [for no-fall no difference]?
// TODO: yDistance <= 0 might be better.
// Also clear accounting data.
// if (to.isOnGround(0.5) || from.isOnGround(0.5)) {
if (from.isOnGround(0.5, 0.2, 0) || to.isOnGround(0.5, Math.min(0.2, 0.01 + hDistance), Math.min(0.1, 0.01 + -yDistance))) {
return applyLostGround(player, from, true, data, "edgedesc", tags);
}
}
// Nothing found.
return false;
}
/**
* Check if a ground-touch has been lost due to event-sending-frequency or
* other reasons.<br>
* This is for fast descending only (yDistance < -0.5). Needs last move
* data.
*
* @param player
* @param from
* @param to
* @param hDistance
* @param yDistance
* @param sprinting
* @param data
* @param cc
* @return
*/
private static boolean lostGroundFastDescend(final Player player, final PlayerLocation from, final PlayerLocation to, final double hDistance, final double yDistance, final boolean sprinting, final MoveData lastMove, final MovingData data, final MovingConfig cc, final Collection<String> tags) {
// TODO: re-organize for faster exclusions (hDistance, yDistance).
// TODO: more strict conditions
// Lost ground while falling onto/over edges of blocks.
if (yDistance > lastMove.yDistance && !to.isOnGround()) {
// TODO: Should this be an extra lost-ground(to) check, setting toOnGround [for no-fall no difference]?
// TODO: yDistance <= 0 might be better.
// Also clear accounting data.
// TODO: stairs ?
// TODO: Can it be safe to only check to with raised margin ? [in fact should be checked from higher yMin down]
// TODO: Interpolation method (from to)?
if (from.isOnGround(0.5, 0.2, 0) || to.isOnGround(0.5, Math.min(0.3, 0.01 + hDistance), Math.min(0.1, 0.01 + -yDistance))) {
// (Usually yDistance should be -0.078)
return applyLostGround(player, from, true, data, "fastedge", tags);
}
}
return false;
}
/**
* Apply lost-ground workaround.
* @param player
* @param refLoc
* @param setBackSafe If to use the given location as set-back.
* @param data
* @param tag Added to "lostground_" as tag.
* @return Always true.
*/
public static boolean applyLostGround(final Player player, final Location refLoc, final boolean setBackSafe, final MovingData data, final String tag, final Collection<String> tags, final MCAccess mcAccess) {
if (setBackSafe) {
data.setSetBack(refLoc);
}
else {
// Keep Set-back.
}
return applyLostGround(player, data, tag, tags, mcAccess);
}
/**
* Apply lost-ground workaround.
* @param player
* @param refLoc
* @param setBackSafe If to use the given location as set-back.
* @param data
* @param tag Added to "lostground_" as tag.
* @return Always true.
*/
private static boolean applyLostGround(final Player player, final PlayerLocation refLoc, final boolean setBackSafe, final MovingData data, final String tag, final Collection<String> tags) {
// Set the new setBack and reset the jumpPhase.
if (setBackSafe) {
data.setSetBack(refLoc);
}
else {
// Keep Set-back.
}
return applyLostGround(player, data, tag, tags, refLoc.getMCAccess());
}
/**
* Apply lost-ground workaround (data adjustments and tag).
* @param player
* @param refLoc
* @param setBackSafe If to use the given location as set-back.
* @param data
* @param tag Added to "lostground_" as tag.
* @return Always true.
*/
private static boolean applyLostGround(final Player player, final MovingData data, final String tag, final Collection<String> tags, final MCAccess mcAccess) {
// Reset the jumpPhase.
// ? set jumpphase to 1 / other, depending on stuff ?
data.sfJumpPhase = 0;
data.jumpAmplifier = MovingUtil.getJumpAmplifier(player, mcAccess);
data.clearAccounting();
// Tell NoFall that we assume the player to have been on ground somehow.
data.thisMove.touchedGround = true;
data.thisMove.touchedGroundWorkaround = true;
tags.add("lostground_" + tag);
return true;
}
}

11
NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/moving/util/MovingUtil.java
View File

@ -16,6 +16,7 @@ import fr.neatmonster.nocheatplus.checks.moving.MovingData;
import fr.neatmonster.nocheatplus.checks.moving.model.MoveData; import fr.neatmonster.nocheatplus.checks.moving.model.MoveData;
import fr.neatmonster.nocheatplus.compat.Bridge1_9; import fr.neatmonster.nocheatplus.compat.Bridge1_9;
import fr.neatmonster.nocheatplus.compat.BridgeMisc; import fr.neatmonster.nocheatplus.compat.BridgeMisc;
import fr.neatmonster.nocheatplus.compat.MCAccess;
import fr.neatmonster.nocheatplus.components.IDebugPlayer; import fr.neatmonster.nocheatplus.components.IDebugPlayer;
import fr.neatmonster.nocheatplus.hooks.NCPExemptionManager; import fr.neatmonster.nocheatplus.hooks.NCPExemptionManager;
import fr.neatmonster.nocheatplus.logging.StaticLog; import fr.neatmonster.nocheatplus.logging.StaticLog;
@ -241,4 +242,14 @@ public class MovingUtil {
} }
} }
public static double getJumpAmplifier(final Player player, final MCAccess mcAccess) {
final double amplifier = mcAccess.getJumpAmplifier(player);
if (amplifier == Double.NEGATIVE_INFINITY) {
return 0.0;
}
else {
return 1.0 + amplifier;
}
}
} }

8
NCPCore/src/main/java/fr/neatmonster/nocheatplus/utilities/PlayerLocation.java
View File

@ -1137,4 +1137,12 @@ public class PlayerLocation {
return builder.toString(); return builder.toString();
} }
/**
* Retrieve the internally stored MCAccess instance.
* @return
*/
public MCAccess getMCAccess() {
return mcAccess;
}
} }