From f1dd4f7c7f4d1ffdcc87b58539235049211a8b30 Mon Sep 17 00:00:00 2001 From: RaidMax Date: Mon, 28 Jan 2019 18:21:56 -0600 Subject: [PATCH] Fix IP parsing bug introduced with IW4Parser Additional fix for Webfront Index OoB on _ClientActivity --- Application/Application.csproj | 6 +++--- Application/RconParsers/IW4RConParser.cs | 2 +- SharedLibraryCore/Utilities.cs | 2 +- WebfrontCore/ViewComponents/ServerListViewComponent.cs | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Application/Application.csproj b/Application/Application.csproj index 8e70437cd..f036e7508 100644 --- a/Application/Application.csproj +++ b/Application/Application.csproj @@ -6,7 +6,7 @@ 2.1.5 false RaidMax.IW4MAdmin.Application - 2.2.4.0 + 2.2.4.1 RaidMax Forever None IW4MAdmin @@ -31,8 +31,8 @@ true true - 2.2.4.0 - 2.2.4.0 + 2.2.4.1 + 2.2.4.1 diff --git a/Application/RconParsers/IW4RConParser.cs b/Application/RconParsers/IW4RConParser.cs index 42e32adbf..014c3eedb 100644 --- a/Application/RconParsers/IW4RConParser.cs +++ b/Application/RconParsers/IW4RConParser.cs @@ -34,7 +34,7 @@ namespace IW4MAdmin.Application.RconParsers Configuration.Status.GroupMapping.Add(ParserRegex.GroupType.RConPing, 3); Configuration.Status.GroupMapping.Add(ParserRegex.GroupType.RConNetworkId, 4); Configuration.Status.GroupMapping.Add(ParserRegex.GroupType.RConName, 5); - Configuration.Status.GroupMapping.Add(ParserRegex.GroupType.RConIpAddress, 6); + Configuration.Status.GroupMapping.Add(ParserRegex.GroupType.RConIpAddress, 7); } public IRConParserConfiguration Configuration { get; set; } diff --git a/SharedLibraryCore/Utilities.cs b/SharedLibraryCore/Utilities.cs index 92626e9cf..e5cee2733 100644 --- a/SharedLibraryCore/Utilities.cs +++ b/SharedLibraryCore/Utilities.cs @@ -482,7 +482,7 @@ namespace SharedLibraryCore /// public static bool PromptBool(string question, string description = null, bool defaultValue = true) { - Console.Write($"{question}?{(string.IsNullOrEmpty(description) ? "" : $" ({description}) ")}[y/n]: "); + Console.Write($"{question}?{(string.IsNullOrEmpty(description) ? " " : $" ({description}) ")}[y/n]: "); char response = Console.ReadLine().ToLower().FirstOrDefault(); return response != 0 ? response == 'y' : defaultValue; } diff --git a/WebfrontCore/ViewComponents/ServerListViewComponent.cs b/WebfrontCore/ViewComponents/ServerListViewComponent.cs index a071514b4..e87703385 100644 --- a/WebfrontCore/ViewComponents/ServerListViewComponent.cs +++ b/WebfrontCore/ViewComponents/ServerListViewComponent.cs @@ -28,7 +28,7 @@ namespace WebfrontCore.ViewComponents Level = p.Level.ToLocalizedLevelName(), LevelInt = (int)p.Level }).ToList(), - ChatHistory = s.ChatHistory, + ChatHistory = s.ChatHistory.ToList(), Online = !s.Throttled }).ToList(); return View("_List", serverInfo);