INSANEMODE/IW4M-Admin
1
0
Fork 0
mirror of https://github.com/RaidMax/IW4M-Admin.git synced 2025-07-01 17:41:20 -05:00
Code Issues Releases Wiki Activity

Add server version to master api

Browse Source 
Add IsEvadedOffense to EFPenalty
Fix remote log reading in not Windows
This commit is contained in:
RaidMax
2018-12-16 21:16:56 -06:00
parent 4067217830
commit 9f92b64135
1676 changed files with 287228 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Application/RconParsers/IW4RConParser.cs
View File

@ -106,16 +106,11 @@ namespace IW4MAdmin.Application.RconParsers
ping = int.Parse(regex.Groups[3].Value);
}
else
{
continue;
}
long networkId = regex.Groups[4].Value.ConvertLong();
string name = regex.Groups[5].Value.StripColors().Trim();
int ip = regex.Groups[7].Value.Split(':')[0].ConvertToIP();
int? ip = regex.Groups[7].Value.Split(':')[0].ConvertToIP();
var P = new EFClient()
var client = new EFClient()
{
CurrentAlias = new EFAlias()
{
@ -123,13 +118,19 @@ namespace IW4MAdmin.Application.RconParsers
},
NetworkId = networkId,
ClientNumber = clientNumber,
IPAddress = ip == 0 ? int.MinValue : ip,
IPAddress = ip,
Ping = ping,
Score = score,
IsBot = ip == 0,
IsBot = ip == null,
State = EFClient.ClientState.Connecting
};
StatusPlayers.Add(P);
StatusPlayers.Add(client);
// they've not fully connected yet
if (!client.IsBot && ping == 999)
{
continue;
}
}
}

2
Application/RconParsers/IW5MRConParser.cs
View File

@ -142,7 +142,7 @@ namespace IW4MAdmin.Application.RconParsers
long networkId = 0;//playerInfo[4].ConvertLong();
int.TryParse(playerInfo[0], out clientId);
var regex = Regex.Match(responseLine, @"\d+\.\d+\.\d+.\d+\:\d{1,5}");
int ipAddress = regex.Value.Split(':')[0].ConvertToIP();
int? ipAddress = regex.Value.Split(':')[0].ConvertToIP();
regex = Regex.Match(responseLine, @" +(\d+ +){3}");
int score = Int32.Parse(regex.Value.Split(' ', StringSplitOptions.RemoveEmptyEntries)[0]);

4
Application/RconParsers/T6MRConParser.cs
View File

@ -97,7 +97,7 @@ namespace IW4MAdmin.Application.RconParsers
#if DEBUG
Ping = 1;
#endif
int ipAddress = regex.Value.Split(':')[0].ConvertToIP();
int? ipAddress = regex.Value.Split(':')[0].ConvertToIP();
regex = Regex.Match(responseLine, @"[0-9]{1,2}\s+[0-9]+\s+");
var p = new EFClient()
{
@ -108,7 +108,7 @@ namespace IW4MAdmin.Application.RconParsers
Ping = Ping,
Score = 0,
State = EFClient.ClientState.Connecting,
IsBot = networkId == 0
IsBot = ipAddress == null
};
if (p.IsBot)