Upstream/NoCheatPlus
1
0
Fork 0
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git synced 2024-09-27 14:13:11 +02:00
Code Issues Projects Releases Wiki Activity

Fix magic not used correctly. Indicate stuff.

Browse Source
This commit is contained in:
asofold 2016-12-18 15:11:04 +01:00
parent 1c024c072c
commit 0ea8d379d0
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/moving/MovingListener.java
View File

@ -692,6 +692,8 @@ public class MovingListener extends CheckListener implements TickListener, IRemo
// Check jumping on things like slime blocks.
// Detect bounce type / use prepared bounce.
if (newTo == null) {
// TODO: Mixed ground (e.g. slime blocks + slabs), specifically on pushing.
// TODO: More on fall damage. What with sneaking + past states?
// TODO: With past states: What does jump effects do here?
if (to.getY() < from.getY()) {
// Prepare bounce: The center of the player must be above the block.

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

@ -676,6 +676,11 @@ public class SurvivalFly extends Check {
private double[] getVerticalBlockMoveResult(final double yDistance,
final PlayerLocation from, final PlayerLocation to,
final int tick, final MovingData data) {
/*
* TODO: Pistons pushing horizontally allow similar/same upwards
* (downwards?) moves (possibly all except downwards, which is hard to
* test :p).
*/
// TODO: Allow push up to 1.0 (or 0.65 something) even beyond block borders, IF COVERED [adapt PlayerLocation].
// TODO: Other conditions/filters ... ?
// Push (/pull) up.
@ -1493,17 +1498,19 @@ public class SurvivalFly extends Check {
hDistanceAboveLimit = thisMove.hDistance - hAllowedDistance;
tags.add("permchecks");
}
// Check being moved by blocks.
if (cc.trackBlockMove && hDistanceAboveLimit > 0.0
&& hDistanceAboveLimit < 0.515 // MAGIC
&& hDistanceAboveLimit < 1.025 // MAGIC
) {
// Push by 0.49-0.51 in one direction.
// Push by 0.49-0.51 in one direction. Also observed 1.02.
// TODO: Better also test if the per axis distance is equal to or exceeds hDistanceAboveLimit?
// TODO: The minimum push value can be misleading (blocked by a block?)
final double xDistance = to.getX() - from.getX();
final double zDistance = to.getZ() - from.getZ();
if (Math.abs(xDistance) > 0.485 && Math.abs(xDistance) < 1.025
&& from.matchBlockChange(blockChangeTracker, data.blockChangeRef,
xDistance < 0 ? Direction.X_NEG : Direction.X_POS, 0.05)) {
xDistance < 0 ? Direction.X_NEG : Direction.X_POS, 0.05)) {
hAllowedDistance = thisMove.hDistance; // MAGIC
hDistanceAboveLimit = 0.0;
}