Upstream/NoCheatPlus
1
0
Fork 0
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git synced 2024-11-14 22:35:13 +01:00
Code Issues Projects Releases Wiki Activity

[Bleeding] Bring in new god-mode check.

Browse Source
This commit is contained in:
asofold 2013-02-01 09:38:58 +01:00
parent f4727ad3a2
commit dba567ee2b
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -218,8 +218,8 @@ public class FightListener extends CheckListener {
final boolean damagedIsDead = damaged.isDead();
if (damagedIsPlayer && !damagedIsDead) {
final Player player = (Player) event.getEntity();
if (godMode.isEnabled(player) && godMode.check(player)){
// if (godMode.isEnabled(player) && godMode.check(player, event.getDamage())){
// if (godMode.isEnabled(player) && godMode.check(player)){
if (godMode.isEnabled(player) && godMode.check(player, event.getDamage())){
// It requested to "cancel" the players invulnerability, so set his noDamageTicks to 0.
player.setNoDamageTicks(0);
}

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

@ -6,6 +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.TickTask;
/*
@ -141,7 +142,6 @@ public class GodMode extends Check {
if (noDamageTicks == 10 || dTick == 1 && noDamageTicks < 19){
set = true;
Bukkit.getServer().broadcastMessage("God " + player.getName() + " GRACE");
}
if (delta == 1){
@ -149,7 +149,7 @@ public class GodMode extends Check {
legit = true;
}
Bukkit.getServer().broadcastMessage("God " + player.getName() + " delta=" + delta + " dt=" + dTick + " dndt=" + dNDT + " acc=" + data.godModeAcc + " d=" + damage + " ndt=" + noDamageTicks + " h=" + health + " slag=" + TickTask.getLag(dTick));
// Bukkit.getServer().broadcastMessage("God " + player.getName() + " delta=" + delta + " dt=" + dTick + " dndt=" + dNDT + " acc=" + data.godModeAcc + " d=" + damage + " ndt=" + noDamageTicks + " h=" + health + " slag=" + TickTask.getLag(dTick));
// TODO: might check last damage taken as well (really taken with health change)
@ -187,7 +187,14 @@ public class GodMode extends Check {
if (dht <= 20) return false;
}
// TODO: Check for lagging players with keepalive timestamp.
// 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 ?
return false;
}
// Violation probably.
data.godModeAcc += delta;
@ -195,6 +202,7 @@ public class GodMode extends Check {
boolean cancel = false;
// TODO: bounds
if (data.godModeAcc > 2){
// TODO: To match with old checks vls / actions, either change actions or apply a factor.
data.godModeVL += delta;
if (executeActions(player, data.godModeVL, delta, FightConfig.getConfig(player).godModeActions)){
cancel = true;