INSANEMODE/IW4M-Admin
1
0
Fork 0
mirror of https://github.com/RaidMax/IW4M-Admin.git synced 2025-06-11 15:52:25 -05:00
Code Issues Releases Wiki Activity

Use game time from log to ignore potential false disconnect lines - Fix for latent linking issues with multiple ips - Anticheat fix for T6 - retry kick on update if they're not allowed to connect

Browse Source
This commit is contained in:
RaidMax
2020-02-06 18:35:30 -06:00
parent 2a30dd6d09
commit 9f603937e1
8 changed files with 120 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Plugins/Stats/Cheat/Detection.cs
View File

@ -70,7 +70,7 @@ namespace IW4MAdmin.Plugins.Stats.Cheat
/// </summary>
/// <param name="hit">kill performed by the player</param>
/// <returns>true if detection reached thresholds, false otherwise</returns>
public DetectionPenaltyResult ProcessHit(EFClientKill hit, bool isDamage)
public IEnumerable<DetectionPenaltyResult> ProcessHit(EFClientKill hit)
{
var results = new List<DetectionPenaltyResult>();
@ -81,10 +81,10 @@ namespace IW4MAdmin.Plugins.Stats.Cheat
// hack: prevents false positives
(LastWeapon != hit.Weapon && (hit.TimeOffset - LastOffset) == 50))
{
return new DetectionPenaltyResult()
return new[] {new DetectionPenaltyResult()
{
ClientPenalty = EFPenalty.PenaltyType.Any,
};
}};
}
LastWeapon = hit.Weapon;
@ -92,7 +92,7 @@ namespace IW4MAdmin.Plugins.Stats.Cheat
HitLocationCount[hit.HitLoc].Count++;
HitCount++;
if (!isDamage)
if (hit.IsKill)
{
Kills++;
}
@ -464,12 +464,7 @@ namespace IW4MAdmin.Plugins.Stats.Cheat
Tracker.OnChange(snapshot);
return results.FirstOrDefault(_result => _result.ClientPenalty == EFPenalty.PenaltyType.Ban) ??
results.FirstOrDefault(_result => _result.ClientPenalty == EFPenalty.PenaltyType.Flag) ??
new DetectionPenaltyResult()
{
ClientPenalty = EFPenalty.PenaltyType.Any,
};
return results;
}
}
}

23
Plugins/Stats/Helpers/StatManager.cs
View File

@ -510,7 +510,6 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
if (Plugin.Config.Configuration().EnableAntiCheat && !attacker.IsBot && attacker.ClientId != victim.ClientId)
{
DetectionPenaltyResult result = new DetectionPenaltyResult() { ClientPenalty = EFPenalty.PenaltyType.Any };
clientDetection.TrackedHits.Add(hit);
if (clientDetection.TrackedHits.Count >= MIN_HITS_TO_RUN_DETECTION)
@ -525,9 +524,9 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
if (oldestHit.IsAlive)
{
result = clientDetection.ProcessHit(oldestHit, isDamage);
var result = DeterminePenaltyResult(clientDetection.ProcessHit(oldestHit), attacker.CurrentServer.EndPoint);
#if !DEBUG
await ApplyPenalty(result, attacker);
await ApplyPenalty(result, attacker);
#endif
if (clientDetection.Tracker.HasChanges && result.ClientPenalty != EFPenalty.PenaltyType.Any)
@ -564,6 +563,18 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
}
}
private DetectionPenaltyResult DeterminePenaltyResult(IEnumerable<DetectionPenaltyResult> results, long serverId)
{
// allow disabling of certain detection types
results = results.Where(_result => ShouldUseDetection(serverId, _result.Type));
return results.FirstOrDefault(_result => _result.ClientPenalty == EFPenalty.PenaltyType.Ban) ??
results.FirstOrDefault(_result => _result.ClientPenalty == EFPenalty.PenaltyType.Flag) ??
new DetectionPenaltyResult()
{
ClientPenalty = EFPenalty.PenaltyType.Any,
};
}
public async Task SaveHitCache(long serverId)
{
using (var ctx = new DatabaseContext(true))
@ -594,12 +605,6 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
async Task ApplyPenalty(DetectionPenaltyResult penalty, EFClient attacker)
{
// allow disabling of certain detection types
if (!ShouldUseDetection(attacker.CurrentServer.EndPoint, penalty.Type))
{
return;
}
var penaltyClient = Utilities.IW4MAdminClient(attacker.CurrentServer);
switch (penalty.ClientPenalty)
{