Upstream/NoCheatPlus
1
0
Fork 0
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git synced 2024-06-26 06:14:42 +02:00
Code Issues Projects Releases Wiki Activity

[BREAKING] Ignore set-back override, if cancel is not set.

Browse Source 
Seems better, cancel actions can be set manually.
This commit is contained in:
asofold 2017-04-26 10:38:16 +02:00
parent 34e3548ec5
commit 792bed452c
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -861,8 +861,14 @@ public class MovingListener extends CheckListener implements TickListener, IRemo
data.blockChangeRef.updateFinal(pTo);
}
if (newTo == null && !data.hasTeleported()) {
if (newTo == null) {
// Allowed move.
if (data.hasTeleported()) {
data.resetTeleported();
if (data.debug) {
debug(player, "Ignore hook-induced set-back: actions not set to cancel.");
}
}
// Bounce effects.
if (verticalBounce != BounceType.NO_BOUNCE) {
processBounce(player, pFrom.getY(), pTo.getY(), verticalBounce, tick, data, cc);
@ -883,6 +889,9 @@ public class MovingListener extends CheckListener implements TickListener, IRemo
}
else {
if (data.hasTeleported()) {
if (data.debug) {
debug(player, "The set back has been overridden from (" + newTo + ") to: " + data.getTeleported());
}
newTo = data.getTeleported();
}
if (data.debug) { // TODO: Remove, if not relevant (doesn't look like it was :p).