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

Ensure to reset the (mc) fall distance on ground.

Browse Source
This commit is contained in:
asofold 2015-07-23 22:19:59 +02:00
parent 06eecb704d
commit 135c89ca70
1 changed files with 37 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/moving/NoFall.java
View File

@ -62,7 +62,10 @@ public class NoFall extends Check {
data.noFallSkipAirCheck = true;
dealFallDamage(player, maxD);
}
else data.clearNoFallData();
else {
data.clearNoFallData();
player.setFallDistance(0);
}
}
/**
@ -157,8 +160,12 @@ public class NoFall extends Check {
}
else if (fromOnGround || data.noFallAssumeGround) {
// Check if to deal damage (fall back damage check).
if (cc.noFallDealDamage) handleOnGround(player, minY, true, data, cc);
else adjustFallDistance(player, minY, true, data, cc);
if (cc.noFallDealDamage) {
handleOnGround(player, minY, true, data, cc);
}
else {
adjustFallDistance(player, minY, true, data, cc);
}
}
else if (toReset) {
// Just reset.
@ -170,8 +177,12 @@ public class NoFall extends Check {
// In this case the player has traveled further: add the difference.
data.noFallFallDistance -= yDiff;
}
if (cc.noFallDealDamage) handleOnGround(player, minY, true, data, cc);
else adjustFallDistance(player, minY, true, data, cc);
if (cc.noFallDealDamage) {
handleOnGround(player, minY, true, data, cc);
}
else {
adjustFallDistance(player, minY, true, data, cc);
}
}
else {
// Ensure fall distance is correct, or "anyway"?
@ -199,8 +210,8 @@ public class NoFall extends Check {
if (data.noFallFallDistance > 0) {
data.noFallFallDistance = 0;
}
if (mcFallDistance > 0){
player.setFallDistance(0);
if (mcFallDistance > 0f) {
player.setFallDistance(0f);
}
}
}