INSANEMODE/IW4M-Admin
1
0
Fork 0
mirror of https://github.com/RaidMax/IW4M-Admin.git synced 2025-06-23 05:30:39 -05:00
Code Issues Releases Wiki Activity

merge from 2.3

Browse Source
This commit is contained in:
RaidMax
2019-08-28 13:47:38 -05:00
parent 7d0540fc7d 718ad3bf7f
commit a4d0aedf16
4 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Plugins/ScriptPlugins/SharedGUIDKick.js
View File

@ -17,12 +17,13 @@ var plugin = {
gameEvent.Origin.NetworkId === 5859032128210324569 ||
gameEvent.Origin.NetworkId === 2908745942105435771 ||
gameEvent.Origin.NetworkId === -6492697076432899192 ||
gameEvent.Origin.NetworkId === 1145760003260769995 ||
gameEvent.Origin.NetworkId === -7102887284306116957 ||
gameEvent.Origin.NetworkId === 3304388024725980231) {
gameEvent.Origin.Kick('Your GUID is generic. Delete players/guids.dat and rejoin', _IW4MAdminClient);
}
}
},
onLoadAsync: function (manager) {
},

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

@ -547,12 +547,14 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
hit.DeathType == IW4Info.MeansOfDeath.MOD_RIFLE_BULLET ||
hit.DeathType == IW4Info.MeansOfDeath.MOD_HEAD_SHOT)
{
clientStats.HitLocations.Single(hl => hl.Location == hit.HitLoc).HitCount += 1;
clientStats.HitLocations.First(hl => hl.Location == hit.HitLoc).HitCount += 1;
}
if (clientStats.SessionKills % Detection.MAX_TRACKED_HIT_COUNT == 0)
{
await OnProcessingPenalty.WaitAsync();
await SaveClientStats(clientStats);
OnProcessingPenalty.Release(1);
}
if (hit.IsKillstreakKill)
@ -564,7 +566,7 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
{
if (Plugin.Config.Configuration().StoreClientKills)
{
OnProcessingPenalty.Wait();
await OnProcessingPenalty.WaitAsync();
_hitCache.Add(hit);
if (_hitCache.Count > Detection.MAX_TRACKED_HIT_COUNT)
@ -581,10 +583,11 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
OnProcessingPenalty.Release(1);
}
if (Plugin.Config.Configuration().EnableAntiCheat && !attacker.IsBot && attacker.ClientId != victim.ClientId)
{
DetectionPenaltyResult result = new DetectionPenaltyResult() { ClientPenalty = EFPenalty.PenaltyType.Any };
await OnProcessingPenalty.WaitAsync();
#if DEBUG
if (clientDetection.TrackedHits.Count > 0)
#else
@ -593,7 +596,7 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
{
while (clientDetection.TrackedHits.Count > 0)
{
await OnProcessingPenalty.WaitAsync();
var oldestHit = clientDetection.TrackedHits.OrderBy(_hits => _hits.TimeOffset).First();
clientDetection.TrackedHits.Remove(oldestHit);
@ -611,12 +614,9 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
if (result.ClientPenalty == EFPenalty.PenaltyType.Ban)
{
OnProcessingPenalty.Release(1);
break;
}
}
OnProcessingPenalty.Release(1);
}
}
@ -624,6 +624,8 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
{
clientDetection.TrackedHits.Add(hit);
}
OnProcessingPenalty.Release(1);
}
}
@ -634,7 +636,7 @@ namespace IW4MAdmin.Plugins.Stats.Helpers
if (OnProcessingPenalty.CurrentCount == 0)
{
OnProcessingPenalty.Release();
OnProcessingPenalty.Release(1);
}
}
}