Upstream/NoCheatPlus
1
0
Fork 0
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git synced 2024-11-02 08:40:01 +01:00
Code Issues Projects Releases Wiki Activity

TEST: Introduce absolute reference y for NoFall.

Browse Source
This commit is contained in:
asofold 2012-08-12 07:37:52 +02:00
parent e1075dc90a
commit 6f65a2faa0
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/fr/neatmonster/nocheatplus/checks/moving/MovingData.java
View File

@ -88,6 +88,7 @@ public class MovingData implements CheckData {
public boolean noFallOnGroundServer; public boolean noFallOnGroundServer;
public boolean noFallWasOnGroundClient; public boolean noFallWasOnGroundClient;
public boolean noFallWasOnGroundServer; public boolean noFallWasOnGroundServer;
public double noFallY;
// Data of the survival fly check. // Data of the survival fly check.
public int survivalFlyJumpPhase; public int survivalFlyJumpPhase;

11
src/fr/neatmonster/nocheatplus/checks/moving/NoFall.java
View File

@ -87,6 +87,7 @@ public class NoFall extends Check {
if (!damageEvent.isCancelled()) player.damage(damageEvent.getDamage()); if (!damageEvent.isCancelled()) player.damage(damageEvent.getDamage());
} }
data.noFallFallDistance = 0.0; data.noFallFallDistance = 0.0;
data.noFallY = to.getY();
player.setFallDistance(0.0f); player.setFallDistance(0.0f);
} }
@ -106,9 +107,11 @@ public class NoFall extends Check {
data.noFallVL += data.noFallFallDistance - player.getFallDistance(); data.noFallVL += data.noFallFallDistance - player.getFallDistance();
// Execute the actions to find out if we need to cancel the event or not. // Execute the actions to find out if we need to cancel the event or not.
if (executeActions(player, data.noFallVL, cc.noFallActions)) if (executeActions(player, data.noFallVL, cc.noFallActions)){
// Set the fall distance to its right value. // Set the fall distance to its right value.
player.setFallDistance((float) data.noFallFallDistance); player.setFallDistance((float) data.noFallFallDistance);
}
} else } else
// Reward the player by lowering his violation level. // Reward the player by lowering his violation level.
data.noFallVL *= 0.95D; data.noFallVL *= 0.95D;
@ -151,9 +154,11 @@ public class NoFall extends Check {
final AxisAlignedBB boundingBoxGround = player.boundingBox.clone().d(packet.x - player.locX, final AxisAlignedBB boundingBoxGround = player.boundingBox.clone().d(packet.x - player.locX,
packet.y - player.locY - 0.001D, packet.z - player.locZ); packet.y - player.locY - 0.001D, packet.z - player.locZ);
data.noFallOnGroundServer = player.world.getCubes(player, boundingBoxGround).size() > 0; data.noFallOnGroundServer = player.world.getCubes(player, boundingBoxGround).size() > 0;
if (packet.hasPos && data.noFallWasOnGroundServer && !data.noFallOnGroundServer) if (packet.hasPos && data.noFallWasOnGroundServer && !data.noFallOnGroundServer){
data.noFallFallDistance = 0D; data.noFallFallDistance = 0D;
data.noFallY = player.locY;
}
else if (packet.hasPos && player.locY - packet.y > 0D) else if (packet.hasPos && player.locY - packet.y > 0D)
data.noFallFallDistance += player.locY - packet.y; data.noFallFallDistance = Math.max(0.0, data.noFallY - player.locY); //+= player.locY - packet.y;
} }
} }