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

[Bleeding] Kill Jesus!

Browse Source 
Just kidding. Introduces a lift-off medium tracking for jumping to be
able to limit the maximum jump-phase for lifting off water.
This commit is contained in:
asofold 2013-02-01 06:51:21 +01:00
parent 4f125728f2
commit d8733f873b
3 changed files with 75 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/checks/moving/MediumLiftOff.java Normal file
View File

@ -0,0 +1,17 @@
package fr.neatmonster.nocheatplus.checks.moving;
/**
* This is for tracking what medium a player has been in before lift-off.
* @author mc_dev
*
*/
public enum MediumLiftOff {
/** Ordinary ground, normal jumping. */
GROUND,
/**
* Used for reduced jumping height. Until known better this is used for fluids, cobweb.
*/
LIMIT_JUMP,
// TODO: Might add NO_JUMP (web?).
}

55
NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/checks/moving/MovingData.java
View File

@ -69,6 +69,11 @@ public class MovingData extends ACheckData {
playersMap.clear();
}
/**
* Assume the player has to move on ground or so to lift off. TODO: Test, might be better ground.
*/
private static final MediumLiftOff defaultMediumLiftOff = MediumLiftOff.LIMIT_JUMP;
// Violation levels.
public double creativeFlyVL = 0D;
public double morePacketsVL = 0D;
@ -90,6 +95,7 @@ public class MovingData extends ACheckData {
public double toX = Double.MAX_VALUE, toY, toZ;
/** To/from was ground or web or assumed to be etc. */
public boolean toWasReset, fromWasReset;
public MediumLiftOff mediumLiftOff = defaultMediumLiftOff;
// Data of the creative check.
public boolean creativeFlyPreviousRefused;
@ -165,6 +171,7 @@ public class MovingData extends ACheckData {
toWasReset = fromWasReset = false; // TODO: true maybe
sfHoverTicks = -1;
sfDirty = false;
mediumLiftOff = defaultMediumLiftOff;
}
/**
@ -192,7 +199,32 @@ public class MovingData extends ACheckData {
toWasReset = fromWasReset = false; // TODO: true maybe
sfHoverTicks = -1;
sfDirty = false;
mediumLiftOff = defaultMediumLiftOff;
}
/**
* Just reset the "last locations" references.
* @param loc
*/
public void resetPositions(final Location loc){
if (loc == null) resetPositions(Double.MAX_VALUE, 0, 0);
else resetPositions(loc.getX(), loc.getY(), loc.getZ());
}
/**
* Just reset the "last locations" references.
* @param x
* @param y
* @param z
*/
public void resetPositions(final double x, final double y, final double z) {
fromX = toX = x;
fromY = toY = y;
fromZ = toZ = z;
sfLastYDist = Double.MAX_VALUE;
sfDirty = false;
mediumLiftOff = defaultMediumLiftOff;
}
/**
* Clear accounting data.
@ -223,29 +255,6 @@ public class MovingData extends ACheckData {
noFallSkipAirCheck = false;
}
/**
* Just reset the "last locations" references.
* @param loc
*/
public void resetPositions(final Location loc){
if (loc == null) resetPositions(Double.MAX_VALUE, 0, 0);
else resetPositions(loc.getX(), loc.getY(), loc.getZ());
}
/**
* Just reset the "last locations" references.
* @param x
* @param y
* @param z
*/
public void resetPositions(final double x, final double y, final double z) {
fromX = toX = x;
fromY = toY = y;
fromZ = toZ = z;
sfLastYDist = Double.MAX_VALUE;
sfDirty = false;
}
/**
* Convenience method.
* @param loc

28
NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/checks/moving/SurvivalFly.java
View File

@ -277,8 +277,11 @@ public class SurvivalFly extends Check {
else{
// Check traveled y-distance, orientation is air + jumping + velocity (as far as it gets).
vAllowedDistance = (!(fromOnGround || data.noFallAssumeGround) && !toOnGround ? 1.45D : 1.35D) + data.verticalFreedom;
final int maxJumpPhase;
if (data.jumpAmplifier > 0){
int maxJumpPhase;
if (data.mediumLiftOff == MediumLiftOff.LIMIT_JUMP){
maxJumpPhase = 3;
}
else if (data.jumpAmplifier > 0){
vAllowedDistance += 0.5 + data.jumpAmplifier - 1.0;
maxJumpPhase = (int) (9 + (data.jumpAmplifier - 1.0) * 6);
}
@ -340,6 +343,27 @@ public class SurvivalFly extends Check {
}
// Set data for normal move or violation without cancel (cancel would have returned above)
// Check lift-off medium.
// TODO: Web might be NO_JUMP !
if (to.isInLiquid() || to.isInWeb()){
data.mediumLiftOff = MediumLiftOff.LIMIT_JUMP;
}
else if (resetTo){
// TODO: This might allow jumping on vines etc., but should do for the moment.
data.mediumLiftOff = MediumLiftOff.GROUND;
}
else if (from.isInLiquid() || from.isInWeb()){
data.mediumLiftOff = MediumLiftOff.LIMIT_JUMP;
}
else if (resetFrom || data.noFallAssumeGround){
// TODO: Where exactly to put noFallAssumeGround ?
data.mediumLiftOff = MediumLiftOff.GROUND;
}
else{
// Keep medium.
// TODO: Is above stairs ?
}
// Apply reset conditions.
data.toWasReset = resetTo || data.noFallAssumeGround;