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

Use the keep-alive estimation for the new god-mode check.

Browse Source 
Might not fully do it, but should make occasional hits possible.
This commit is contained in:
asofold 2013-02-02 08:28:52 +01:00
parent e0f5e594be
commit 824e67ffe6
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/checks/fight/FightListener.java
View File

@ -327,6 +327,7 @@ public class FightListener extends CheckListener {
// Remember the time.
data.regainHealthTime = System.currentTimeMillis();
// Set god-mode health to maximum.
// TODO: Mind that health regain might half the ndt.
data.godModeHealth = Math.max(data.godModeHealth, player.getHealth() + event.getAmount());
}

17
NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/checks/fight/GodMode.java
View File

@ -6,7 +6,7 @@ import org.bukkit.entity.Player;
import fr.neatmonster.nocheatplus.NoCheatPlus;
import fr.neatmonster.nocheatplus.checks.Check;
import fr.neatmonster.nocheatplus.checks.CheckType;
import fr.neatmonster.nocheatplus.checks.combined.CombinedData;
import fr.neatmonster.nocheatplus.utilities.CheckUtils;
import fr.neatmonster.nocheatplus.utilities.TickTask;
/*
@ -187,12 +187,15 @@ public class GodMode extends Check {
if (dht <= 20) return false;
}
// Check for lag.
// Simplified method: check moving timestamp, because a hit means a move usually.
final long lastMoveTime = CombinedData.getData(player).lastMoveTime;
final long time = System.currentTimeMillis();
if (lastMoveTime > time || time - lastMoveTime > 1100){
// TODO: reset anything in data ?
// Check for client side lag.
final long now = System.currentTimeMillis();
final long maxAge = 5000; // Allows 5 seconds lag max. TODO: Balance, test.
long keepAlive = mcAccess.getKeepAliveTime(player);
if (keepAlive > now || keepAlive == Long.MIN_VALUE){
keepAlive = CheckUtils.guessKeepAliveTime(player, now, maxAge);
}
if (keepAlive != Double.MIN_VALUE && now - keepAlive > 1000 && now - keepAlive < maxAge){
// Assume lag.
return false;
}