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

Don't deal fall damage for causing passable violations moving from

Browse Source 
ground.

This hopefully prevents a range of login/teleport problems with nofall.
Does not resolve those for tp/login into air.
This commit is contained in:
asofold 2013-04-29 00:39:00 +02:00
parent 634ca39824
commit a493da7ff7
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/checks/moving/MovingListener.java
View File

@ -546,9 +546,14 @@ public class MovingListener extends CheckListener implements TickListener, IRemo
// Check passable first to prevent set-back override.
// TODO: Redesign to set set-backs later (queue + invalidate).
boolean mightSkipNoFall = false; // If to skip nofall check (mainly on violation of other checks).
if (newTo == null && cc.passableCheck && !NCPExemptionManager.isExempted(player, CheckType.MOVING_PASSABLE) && !player.hasPermission(Permissions.MOVING_PASSABLE)) {
// Passable is checked first to get the original set-back locations from the other checks, if needed.
newTo = passable.check(player, loc, pFrom, pTo, data, cc);
if (newTo != null){
// Check if to skip the nofall check.
mightSkipNoFall = true;
}
}
// Check which fly check to check.
@ -615,7 +620,15 @@ public class MovingListener extends CheckListener implements TickListener, IRemo
}
else{
if (checkNf && cc.sfFallDamage){
noFall.checkDamage(player, data, Math.min(Math.min(from.getY(), to.getY()), loc.getY()));
if (mightSkipNoFall){
// Check if to really skip.
if (!pFrom.isOnGround() && !pFrom.isResetCond()){
mightSkipNoFall = false;
}
}
if (!mightSkipNoFall){
noFall.checkDamage(player, data, Math.min(Math.min(from.getY(), to.getY()), loc.getY()));
}
}
}
}