Upstream/NoCheatPlus
1
0
Fork 0
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git synced 2024-11-07 11:10:05 +01:00
Code Issues Projects Releases Wiki Activity

Allow updating set-back, when small-range TP leads to a safe position.

Browse Source
This commit is contained in:
asofold 2015-10-18 17:06:18 +02:00
parent 343b5ac9e3
commit 0b7a259985
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -943,7 +943,7 @@ public class MovingListener extends CheckListener implements TickListener, IRemo
final TeleportCause cause = event.getCause();
if (cause == TeleportCause.UNKNOWN) {
// Check special small range teleports (moved too quickly).
// Check special small range teleports (server moves players out of blocks).
if (from != null && from.getWorld().equals(to.getWorld())) {
if (TrigUtil.distance(from, to) < margin) {
smallRange = true;
@ -954,6 +954,11 @@ public class MovingListener extends CheckListener implements TickListener, IRemo
smallRange = true;
}
}
// Override smallRange, if the teleport seems ok.
if (smallRange && BlockProperties.isOnGroundOrResetCond(player, to, cc.yOnGround) && BlockProperties.isPassable(to)) {
// TODO: Consider to remove the smallRange workaround and re-evaluate [Block jump on protected region into fence].
smallRange = false;
}
}
}
else if (cause == TeleportCause.ENDER_PEARL) {