Upstream/NoCheatPlus
1
0
Fork 0
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git synced 2025-03-09 13:09:09 +01:00
Code Issues Projects Releases Wiki Activity

Don't modify walkspeed by attributes. Allow air friction on bunnyfly.

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

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

@ -189,7 +189,7 @@ public class SurvivalFly extends Check {
// Use the player-specific walk speed.
// TODO: Might get from listener.
// TODO: Use in lostground?
final double walkSpeed = SurvivalFly.walkSpeed * ((double) data.walkSpeed / 0.2) * mcAccess.getSpeedAttributeMultiplier(player);
final double walkSpeed = SurvivalFly.walkSpeed * ((double) data.walkSpeed / 0.2);
setNextFriction(from, to, data, cc);
@ -653,6 +653,9 @@ public class SurvivalFly extends Check {
hAllowedDistance *= modDownStream;
}
// Attributes in here.
hAllowedDistance *= mcAccess.getSpeedAttributeMultiplier(player);
// Short cut.
// TODO: Check if a) early return makes sense and b) do it for each of the following parts.
// TODO: Should debug really make a difference? Do early return before permission check only?
@ -1007,7 +1010,7 @@ public class SurvivalFly extends Check {
if (data.bunnyhopDelay > 0 && hDistance > walkSpeed) { // * modSprint) {
allowHop = false; // Magic!
final int hopTime = bunnyHopMax - data.bunnyhopDelay;
// 2x horizontal speed increase detection.
if (data.sfLastHDist != Double.MAX_VALUE && hDistance - data.sfLastHDist >= walkSpeed * 0.5 && hopTime == 1) {
if (data.sfLastYDist == 0.0 && (data.fromWasReset || data.toWasReset) && yDistance >= 0.4) {
@ -1021,7 +1024,7 @@ public class SurvivalFly extends Check {
// TODO: Why not (!allowHop && ... ?
if (data.sfLastHDist != Double.MAX_VALUE) {
final double hDistDiff = data.sfLastHDist - hDistance;
if ((hDistDiff >= data.sfLastHDist / bunnyDivFriction || hDistDiff >= hDistanceAboveLimit / 31.4) &&
if ((hDistDiff >= data.sfLastHDist / bunnyDivFriction || hDistDiff >= hDistanceAboveLimit / 33.3 || hDistance <= data.sfLastHDist * SurvivalFly.FRICTION_MEDIUM_AIR) &&
hDistanceAboveLimit <= someThreshold) {
// Speed must decrease by "a lot" at first, then by some minimal amount per event.
// TODO: 100.0, 110.0, ... might allow to confine buffer to low jump phase.