Upstream
/
NoCheatPlus
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

SurvivalFly - 1.13 Swimming (Dolphins Grace + Depth Strider) 

Better method of detecting player in/above water, which will always apply the faster speed when the player is in water.
This commit is contained in:
CaptainObvious0 2019-03-13 20:55:47 -05:00 committed by GitHub
parent 29d7015d3c
commit cf9689b3a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -319,7 +319,7 @@ public class SurvivalFly extends Check {
if (hasHdist) {
// Check allowed vs. taken horizontal distance.
// Get the allowed distance.
hAllowedDistance = setAllowedhDist(player, sprinting, thisMove, data, cc, pData, false);
hAllowedDistance = setAllowedhDist(player, sprinting, thisMove, data, cc, pData, from, false);
// Judge if horizontal speed is above limit.
hDistanceAboveLimit = hDistance - hAllowedDistance;
@ -849,7 +849,7 @@ public class SurvivalFly extends Check {
*/
private double setAllowedhDist(final Player player, final boolean sprinting,
final PlayerMoveData thisMove,
final MovingData data, final MovingConfig cc, final IPlayerData pData,
final MovingData data, final MovingConfig cc, final IPlayerData pData, final PlayerLocation from,
final boolean checkPermissions)
{
// TODO: Optimize for double checking?
@ -889,8 +889,12 @@ public class SurvivalFly extends Check {
// (Friction is used as is.)
// Allows faster speed for player when swimming above water since from -> to does not seem to detect correctly
} else if (thisMove.from.inLiquid && player.hasPotionEffect(PotionEffectType.DOLPHINS_GRACE) || thisMove.to.inLiquid && player.hasPotionEffect(PotionEffectType.DOLPHINS_GRACE)) {
} else if ((BlockProperties.isLiquid(from.getTypeIdBelow()) || BlockProperties.isNewLiq(from.getTypeIdBelow())) && player.hasPotionEffect(PotionEffectType.DOLPHINS_GRACE)) {
hAllowedDistance = Magic.modSwim * thisMove.walkSpeed * cc.survivalFlySwimmingSpeed * Magic.modDolphinsGrace / 100D;
final int level = BridgeEnchant.getDepthStriderLevel(player);
if (level > 0) {
hAllowedDistance = Magic.modSwim * thisMove.walkSpeed * cc.survivalFlySwimmingSpeed * Magic.modDolphinsGrace * Magic.modDepthStrider[level] / 100D;
}
}
// TODO: !sfDirty is very coarse, should use friction instead.
else if (!sfDirty && thisMove.from.onGround && player.isSneaking() && reallySneaking.contains(player.getName())
@ -1607,12 +1611,12 @@ public class SurvivalFly extends Check {
// After failure permission checks ( + speed modifier + sneaking + blocking + speeding) and velocity (!).
if (hDistanceAboveLimit > 0.12 && !skipPermChecks && !thisMove.from.inLiquid && !thisMove.to.inLiquid && !player.hasPotionEffect(PotionEffectType.DOLPHINS_GRACE)) {
// TODO: Most cases these will not apply. Consider redesign to do these last or checking right away and skip here on some conditions.
hAllowedDistance = setAllowedhDist(player, sprinting, thisMove, data, cc, pData, true);
hAllowedDistance = setAllowedhDist(player, sprinting, thisMove, data, cc, pData, from, true);
hDistanceAboveLimit = thisMove.hDistance - hAllowedDistance;
tags.add("permchecks-outliq");
}
if (hDistanceAboveLimit > 0.6 && !skipPermChecks && thisMove.from.inLiquid && thisMove.to.inLiquid && player.hasPotionEffect(PotionEffectType.DOLPHINS_GRACE)) {
hAllowedDistance = setAllowedhDist(player, sprinting, thisMove, data, cc, pData, true);
hAllowedDistance = setAllowedhDist(player, sprinting, thisMove, data, cc, pData, from, true);
hDistanceAboveLimit = thisMove.hDistance - hAllowedDistance;
tags.add("permchecks-inliq");
}