Upstream/NoCheatPlus
1
0
Fork 0
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git synced 2024-10-31 07:40:16 +01:00
Code Issues Projects Releases Wiki Activity

[Bleeding] Account for lag in blockbreak.frequency.

Browse Source
This commit is contained in:
asofold 2013-01-04 14:34:42 +01:00
parent 581cdef7bb
commit e514cc2425
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/checks/blockbreak/Frequency.java
View File

@ -25,21 +25,33 @@ public class Frequency extends Check {
// Full period frequency. // Full period frequency.
final float fullScore = data.frequencyBuckets.score(cc.frequencyBucketFactor); final float fullScore = data.frequencyBuckets.score(cc.frequencyBucketFactor);
final float fullTime = cc.frequencyBuckets * cc.frequencyBucketDur; final long fullTime = cc.frequencyBucketDur * cc.frequencyBuckets;
// Short term arrivals. // Short term arrivals.
final int tick = TickTask.getTick(); final int tick = TickTask.getTick();
if (tick - data.frequencyShortTermTick < cc.frequencyShortTermTicks){ if (tick - data.frequencyShortTermTick < cc.frequencyShortTermTicks){
// Within range, add. // Account for server side lag.
data.frequencyShortTermCount ++; final float stLag = cc.lag ? TickTask.getLag(50L * (tick - data.frequencyShortTermTick), true) : 1f;
if (stLag < 1.5){
// Within range, add.
data.frequencyShortTermCount ++;
}
else{
// Too much lag, reset.
data.frequencyShortTermTick = tick;
data.frequencyShortTermCount = 1;
}
} }
else{ else{
data.frequencyShortTermTick = tick; data.frequencyShortTermTick = tick;
data.frequencyShortTermCount = 1; data.frequencyShortTermCount = 1;
} }
// Account for server side lag.
final float fullLag = cc.lag ? TickTask.getLag(fullTime, true) : 1f;
// Find if one of both or both are violations: // Find if one of both or both are violations:
final float fullViolation = (fullScore > fullTime) ? (fullScore - fullTime) : 0; final float fullViolation = (fullScore > fullTime * fullLag) ? (fullScore - fullTime * fullLag) : 0;
final float shortTermWeight = 50f * cc.frequencyShortTermTicks / (float) cc.frequencyShortTermLimit; final float shortTermWeight = 50f * cc.frequencyShortTermTicks / (float) cc.frequencyShortTermLimit;
final float shortTermViolation = (data.frequencyShortTermCount > cc.frequencyShortTermLimit) final float shortTermViolation = (data.frequencyShortTermCount > cc.frequencyShortTermLimit)
? (data.frequencyShortTermCount - cc.frequencyShortTermLimit) * shortTermWeight : 0; ? (data.frequencyShortTermCount - cc.frequencyShortTermLimit) * shortTermWeight : 0;
@ -47,6 +59,9 @@ public class Frequency extends Check {
boolean cancel = false; boolean cancel = false;
if (violation > 0){ if (violation > 0){
// TODO: account for lag spikes !
final double change = violation / 1000; final double change = violation / 1000;
data.frequencyVL += change; data.frequencyVL += change;
cancel = executeActions(player, data.frequencyVL, change, cc.frequencyActions); cancel = executeActions(player, data.frequencyVL, change, cc.frequencyActions);