diff --git a/Admin/WebService.cs b/Admin/WebService.cs index a05dad82..da77339c 100644 --- a/Admin/WebService.cs +++ b/Admin/WebService.cs @@ -808,7 +808,7 @@ namespace IW4MAdmin }; - if (!recent && individual) + if (!recent && individual && authed) { foreach (var a in ApplicationManager.GetInstance().GetAliases(pp)) { diff --git a/Admin/lib/SharedLibrary.dll b/Admin/lib/SharedLibrary.dll index 559af87f..116e0d22 100644 Binary files a/Admin/lib/SharedLibrary.dll and b/Admin/lib/SharedLibrary.dll differ diff --git a/SharedLibrary/Utilities.cs b/SharedLibrary/Utilities.cs index 7b801cf6..8df15c78 100644 --- a/SharedLibrary/Utilities.cs +++ b/SharedLibrary/Utilities.cs @@ -56,11 +56,10 @@ namespace SharedLibrary int Ping = -1; Int32.TryParse(playerInfo[2], out Ping); String cName = Utilities.StripColors(responseLine.Substring(46, 18)).Trim(); - String npID = responseLine.Substring(29, 17).Trim(); // DONT TOUCH PLZ + string npID = Regex.Match(responseLine, @"([a-z]|[0-9]){16}", RegexOptions.IgnoreCase).Value; int.TryParse(playerInfo[0], out cID); - String cIP = responseLine.Substring(72, 20).Trim().Split(':')[0]; - if (cIP.Split(' ').Count() > 1) - cIP = cIP.Split(' ')[1]; + var regex = Regex.Match(responseLine, @"\d+\.\d+\.\d+.\d+\:\d{1,5}"); + string cIP = regex.Value.Split(':')[0]; Player P = new Player(cName, npID, cID, cIP) { Ping = Ping }; StatusPlayers.Add(P); }