Upstream/NoCheatPlus
1
0
Fork 0
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git synced 2024-07-03 01:34:42 +02:00
Code Issues Projects Releases Wiki Activity

Attempt to refine lostground/edge.

Browse Source
This commit is contained in:
asofold 2015-09-09 01:17:01 +02:00
parent f2783cf1f5
commit d37961ed49
2 changed files with 53 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1277,7 +1277,7 @@ public class SurvivalFly extends Check {
// Step height related.
// TODO: Combine / refine preconditions for step height related.
// TODO: || yDistance <= jump estimate?
if (yDistance <= cc.sfStepHeight) {
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()) {
@ -1285,15 +1285,21 @@ public class SurvivalFly extends Check {
return applyLostGround(player, from, true, data, "step");
}
}
// Could step up (but does something else, potentially).
// Could step up (but might move to another direction, potentially).
if (data.sfLastYDist < 0.0) { // TODO: <= ?
// Generic could step.
// TODO: Possibly confine margin depending on side, moving direction (see client code).
// TODO: Consider player.getLocation too (!).
final double xzMargin = 0.1 + (double) Math.round(from.getWidth() * 500.0) / 1000.0;
if (BlockProperties.isOnGround(to.getBlockCache(), Math.min(from.getX(), to.getX()) - xzMargin, Math.min(to.getY(), from.getY() + cc.sfStepHeight) - to.getyOnGround(), Math.min(from.getZ(), to.getZ()) - xzMargin,
Math.max(from.getX(), to.getX()) + xzMargin, Math.max(to.getY(), from.getY() + cc.sfStepHeight), Math.max(from.getZ(), to.getZ()) + xzMargin)) {
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)) {
return applyLostGround(player, from, false, data, "couldstep");
}
// Close by ground miss.
// TODO: Confine to the part in direction of last from?
// TODO: Confine by fall distance ?
// TODO: Confine by other envelope (always bunny?).
if (!to.isOnGround() && from.isOnGround(from.getyOnGround(), 0.0625, 0.0)) {
return applyLostGround(player, from, false, data, "edgeasc");
}
}
}
// Nothing found.
@ -1344,13 +1350,13 @@ public class SurvivalFly extends Check {
}
}
// Lost ground while falling onto/over edges of blocks.
if (yDistance < 0 && hDistance <= 0.5 && data.sfLastYDist < 0.0 && yDistance > data.sfLastYDist && !to.isOnGround()) {
if (yDistance < 0 && hDistance <= 1.5 && data.sfLastYDist < 0.0 && yDistance > data.sfLastYDist && !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, "edge");
return applyLostGround(player, from, true, data, "edgedesc");
}
}
@ -1393,18 +1399,18 @@ public class SurvivalFly extends Check {
/**
* Apply lost-ground workaround,
* @param player
* @param from
* @param refLoc
* @param setBackSafe If to use from as set-back (if set to false: currently nothing changed).
* @param data
* @param tag Tag extra to "lostground"
* @return Always true.
*/
private boolean applyLostGround(final Player player, final PlayerLocation from, final boolean setBackSafe, final MovingData data, final String tag) {
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.
// TODO: Some interpolated position ?
// TODO: (Task list: sharpen when this is used, might remove isAboveStairs!)
if (setBackSafe) {
data.setSetBack(from);
data.setSetBack(refLoc);
}
else {
// Keep Set-back.

37
NCPCore/src/main/java/fr/neatmonster/nocheatplus/utilities/BlockProperties.java
View File

@ -2372,6 +2372,24 @@ public class BlockProperties {
return bounds;
}
/**
* Like isOnGround, just with minimum and maximum coordinates in arbitrary order.
* @param access
* @param x1
* @param y1
* @param z1
* @param x2
* @param y2
* @param z2
* @param xzMargin Subtracted from minima and added to maxima.
* @param yBelow Subtracted from the minimum of y.
* @param yAbove Added to the maximum of y.
* @return
*/
public static final boolean isOnGroundShuffled(final BlockCache access, final double x1, double y1, final double z1, final double x2, final double y2, final double z2, final double xzMargin, final double yBelow, final double yAbove) {
return isOnGroundShuffled(access, x1, y1, z1, x2, y2, z2, xzMargin, yBelow, yAbove, 0L);
}
/**
* Similar to collides(... , F_GROUND), but also checks the block above (against spider).<br>
* NOTE: This does not return true if stuck, to check for that use collidesBlock for the players location.
@ -2388,6 +2406,25 @@ public class BlockProperties {
return isOnGround(access, minX, minY, minZ, maxX, maxY, maxZ, 0L);
}
/**
* Like isOnGround, just with minimum and maximum coordinates in arbitrary order.
* @param access
* @param x1
* @param y1
* @param z1
* @param x2
* @param y2
* @param z2
* @param xzMargin Subtracted from minima and added to maxima.
* @param yBelow Subtracted from the minimum of y.
* @param yAbove Added to the maximum of y.
* @param ignoreFlags
* @return
*/
public static final boolean isOnGroundShuffled(final BlockCache access, final double x1, double y1, final double z1, final double x2, final double y2, final double z2, final double xzMargin, final double yBelow, final double yAbove, final long ignoreFlags) {
return isOnGround(access, Math.min(x1, x2) - xzMargin, Math.min(y1, y2) - yBelow, Math.min(z1, z2) - xzMargin, Math.max(x1, x2) + xzMargin, Math.max(y1, y2) + yAbove, Math.max(z1, z2) + xzMargin, ignoreFlags);
}
/**
* Similar to collides(... , F_GROUND), but also checks the block above (against spider).<br>
* NOTE: This does not return true if stuck, to check for that use collidesBlock for the players location.