Merge pull request #96 from RaidMax/enhancement/issue-91-check-sv-running

implement feedback from issue #91 when sv_running is off

.gitignore

@@ -221,10 +221,12 @@ DEPLOY
 global.min.css
 global.min.js
 bootstrap-custom.min.css
+bootstrap-custom.css
 **/Master/static
 **/Master/dev_env
 /WebfrontCore/Views/Plugins/*
 /WebfrontCore/wwwroot/**/dds
+/WebfrontCore/wwwroot/images/radar/*
 
 /DiscordWebhook/env
 /DiscordWebhook/config.dev.json
@@ -234,3 +236,5 @@ launchSettings.json
 /Plugins/ScriptPlugins/VpnDetectionPrivate.js
 **/Master/env_master
 /GameLogServer/log_env
+**/*.css
+/Master/master/persistence

Application/API/GameLogServer/IGameLogServer.cs

@@ -6,7 +6,7 @@ namespace IW4MAdmin.Application.API.GameLogServer
     [Header("User-Agent", "IW4MAdmin-RestEase")]
     public interface IGameLogServer
     {
-        [Get("log/{path}")]
-        Task<LogInfo> Log([Path] string path);
+        [Get("log/{path}/{key}")]
+        Task<LogInfo> Log([Path] string path, [Path] string key);
     }
 }

Application/API/GameLogServer/LogInfo.cs

@@ -13,5 +13,7 @@ namespace IW4MAdmin.Application.API.GameLogServer
         public int Length { get; set; }
         [JsonProperty("data")]
         public string Data { get; set; }
+        [JsonProperty("next_key")]
+        public string NextKey { get; set; }
     }
 }

Application/API/Master/ApiInstance.cs

@@ -1,19 +1,36 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using System.Collections.Generic;
 using Newtonsoft.Json;
-using RestEase;
+using SharedLibraryCore.Helpers;
 
 namespace IW4MAdmin.Application.API.Master
 {
+    /// <summary>
+    /// Defines the structure of the IW4MAdmin instance for the master API
+    /// </summary>
     public class ApiInstance
     {
+        /// <summary>
+        /// Unique ID of the instance
+        /// </summary>
         [JsonProperty("id")]
         public string Id { get; set; }
+
+        /// <summary>
+        /// Indicates how long the instance has been running
+        /// </summary>
         [JsonProperty("uptime")]
         public int Uptime { get; set; }
+
+        /// <summary>
+        /// Specifices the version of the instance
+        /// </summary>
         [JsonProperty("version")]
-        public float Version { get; set; }
+        [JsonConverter(typeof(BuildNumberJsonConverter))]
+        public BuildNumber Version { get; set; }
+
+        /// <summary>
+        /// List of servers the instance is monitoring
+        /// </summary>
         [JsonProperty("servers")]
         public List<ApiServer> Servers { get; set; }
     }

Application/API/Master/Heartbeat.cs

@@ -1,22 +1,21 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading;
 using System.Threading.Tasks;
 using RestEase;
-using SharedLibraryCore;
 
 namespace IW4MAdmin.Application.API.Master
 {
-    public class HeartbeatState
-    {
-        public bool Connected { get; set; }
-        public CancellationToken Token { get; set; }
-    }
-
+    /// <summary>
+    /// Defines the heartbeat functionality for IW4MAdmin
+    /// </summary>
     public class Heartbeat
     {
+        /// <summary>
+        /// Sends heartbeat to master server
+        /// </summary>
+        /// <param name="mgr"></param>
+        /// <param name="firstHeartbeat"></param>
+        /// <returns></returns>
         public static async Task Send(ApplicationManager mgr, bool firstHeartbeat = false)
         {
             var api = Endpoint.Get();
@@ -35,7 +34,7 @@ namespace IW4MAdmin.Application.API.Master
             {
                 Id = mgr.GetApplicationSettings().Configuration().Id,
                 Uptime = (int)(DateTime.UtcNow - mgr.StartTime).TotalSeconds,
-                Version = (float)Program.Version,
+                Version = Program.Version,
                 Servers = mgr.Servers.Select(s =>
                             new ApiServer()
                             {
@@ -47,19 +46,26 @@ namespace IW4MAdmin.Application.API.Master
                                 Map = s.CurrentMap.Name,
                                 MaxClientNum = s.MaxClients,
                                 Id = s.EndPoint,
-                                Port = (short)s.GetPort(),
+                                Port = (short)s.Port,
                                 IPAddress = s.IP
                             }).ToList()
             };
 
+            Response<ResultMessage> response = null;
+
             if (firstHeartbeat)
             {
-                var message = await api.AddInstance(instance);
+                response = await api.AddInstance(instance);
             }
 
             else
             {
-                var message = await api.UpdateInstance(instance.Id, instance);
+                response = await api.UpdateInstance(instance.Id, instance);
+            }
+
+            if (response.ResponseMessage.StatusCode != System.Net.HttpStatusCode.OK)
+            {
+                mgr.Logger.WriteWarning($"Response code from master is {response.ResponseMessage.StatusCode}, message is {response.StringContent}");
             }
         }
     }

Application/API/Master/IMasterApi.cs

@@ -4,6 +4,7 @@ using System.Text;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
 using RestEase;
+using SharedLibraryCore.Helpers;
 
 namespace IW4MAdmin.Application.API.Master
 {
@@ -22,9 +23,12 @@ namespace IW4MAdmin.Application.API.Master
     public class VersionInfo
     {
         [JsonProperty("current-version-stable")]
-        public float CurrentVersionStable { get; set; }
+        [JsonConverter(typeof(BuildNumberJsonConverter))]
+        public BuildNumber CurrentVersionStable { get; set; }
+
         [JsonProperty("current-version-prerelease")]
-        public float CurrentVersionPrerelease { get; set; }
+        [JsonConverter(typeof(BuildNumberJsonConverter))]
+        public BuildNumber CurrentVersionPrerelease { get; set; }
     }
 
     public class ResultMessage
@@ -38,11 +42,14 @@ namespace IW4MAdmin.Application.API.Master
 #if !DEBUG
         private static readonly IMasterApi api = RestClient.For<IMasterApi>("http://api.raidmax.org:5000");
 #else
-        private static IMasterApi api = RestClient.For<IMasterApi>("http://127.0.0.1");
+        private static readonly IMasterApi api = RestClient.For<IMasterApi>("http://127.0.0.1");
 #endif
         public static IMasterApi Get() => api;
     }
 
+    /// <summary>
+    /// Defines the capabilities of the master API
+    /// </summary>
     [Header("User-Agent", "IW4MAdmin-RestEase")]
     public interface IMasterApi
     {
@@ -53,13 +60,15 @@ namespace IW4MAdmin.Application.API.Master
         Task<TokenId> Authenticate([Body] AuthenticationId Id);
 
         [Post("instance/")]
-        Task<ResultMessage> AddInstance([Body] ApiInstance instance);
+        [AllowAnyStatusCode]
+        Task<Response<ResultMessage>> AddInstance([Body] ApiInstance instance);
 
         [Put("instance/{id}")]
-        Task<ResultMessage> UpdateInstance([Path] string id, [Body] ApiInstance instance);
+        [AllowAnyStatusCode]
+        Task<Response<ResultMessage>> UpdateInstance([Path] string id, [Body] ApiInstance instance);
 
-        [Get("version")]
-        Task<VersionInfo> GetVersion();
+        [Get("version/{apiVersion}")]
+        Task<VersionInfo> GetVersion([Path] int apiVersion);
 
         [Get("localization")]
         Task<List<SharedLibraryCore.Localization.Layout>> GetLocalization();

Application/Application.csproj

@@ -2,11 +2,10 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
-    <RuntimeFrameworkVersion>2.2.2</RuntimeFrameworkVersion>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <MvcRazorExcludeRefAssembliesFromPublish>false</MvcRazorExcludeRefAssembliesFromPublish>
     <PackageId>RaidMax.IW4MAdmin.Application</PackageId>
-    <Version>2.2.6.5</Version>
+    <Version>2.3.1.0</Version>
     <Authors>RaidMax</Authors>
     <Company>Forever None</Company>
     <Product>IW4MAdmin</Product>
@@ -21,28 +20,40 @@
     <Configurations>Debug;Release;Prerelease</Configurations>
     <Win32Resource />
     <RootNamespace>IW4MAdmin.Application</RootNamespace>
+    <PublishWithAspNetCoreTargetManifest>false</PublishWithAspNetCoreTargetManifest>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="RestEase" Version="1.4.7" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="4.5.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.0" />
+    <PackageReference Include="RestEase" Version="1.4.10" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="4.7.0" />
   </ItemGroup>
 
   <PropertyGroup>
-    <ServerGarbageCollection>true</ServerGarbageCollection>
+    <ServerGarbageCollection>false</ServerGarbageCollection>
+    <ConcurrentGarbageCollection>true</ConcurrentGarbageCollection>
     <TieredCompilation>true</TieredCompilation>
-    <AssemblyVersion>2.2.6.5</AssemblyVersion>
-    <FileVersion>2.2.6.5</FileVersion>
+    <AssemblyVersion>2.3.1.0</AssemblyVersion>
+    <FileVersion>2.3.1.0</FileVersion>
+    <LangVersion>7.1</LangVersion>
+    <StartupObject></StartupObject>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Prerelease|AnyCPU'">
+    <ErrorReport>none</ErrorReport>
+    <DebugType>full</DebugType>
+    <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\SharedLibraryCore\SharedLibraryCore.csproj">
       <Private>true</Private>
     </ProjectReference>
-    <ProjectReference Include="..\WebfrontCore\WebfrontCore.csproj">
-      <Private>true</Private>
-      <CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
-    </ProjectReference>
+    <ProjectReference Include="..\WebfrontCore\WebfrontCore.csproj" />
   </ItemGroup>
 
   <ItemGroup>
@@ -51,22 +62,18 @@
     </None>
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Update="Microsoft.NETCore.App" Version="2.2.2" />
-  </ItemGroup>
-
   <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
-    <Exec Command="call $(ProjectDir)BuildScripts\PreBuild.bat $(ProjectDir)..\ $(ProjectDir) $(TargetDir) $(OutDir)" />
+    <Exec Command="if $(ConfigurationName) == Debug call $(ProjectDir)BuildScripts\PreBuild.bat $(ProjectDir)..\ $(ProjectDir) $(TargetDir) $(OutDir)" />
   </Target>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">
     <GetAssemblyIdentity AssemblyFiles="$(TargetPath)">
       <Output TaskParameter="Assemblies" ItemName="CurrentAssembly" />
     </GetAssemblyIdentity>
-    <Exec Command="call $(ProjectDir)BuildScripts\PostBuild.bat $(ProjectDir)..\ $(ProjectDir) $(TargetDir) $(OutDir) %(CurrentAssembly.Version)" />
+    <Exec Command="if $(ConfigurationName) == Debug call $(ProjectDir)BuildScripts\PostBuild.bat $(ProjectDir)..\ $(ProjectDir) $(TargetDir) $(OutDir) %25(CurrentAssembly.Version)" />
   </Target>
 
   <Target Name="PostPublish" AfterTargets="Publish">
-    <Exec Command="call $(ProjectDir)BuildScripts\PostPublish.bat $(ProjectDir)..\ $(ProjectDir) $(TargetDir) $(ConfigurationName)" />
+    <Exec Command="if $(ConfigurationName) == Debug call $(ProjectDir)BuildScripts\PostPublish.bat $(ProjectDir)..\ $(ProjectDir) $(TargetDir) $(ConfigurationName)" />
   </Target>
 </Project>

Application/ApplicationManager.cs

@@ -12,85 +12,76 @@ using SharedLibraryCore.Events;
 using SharedLibraryCore.Exceptions;
 using SharedLibraryCore.Helpers;
 using SharedLibraryCore.Interfaces;
-using SharedLibraryCore.Objects;
 using SharedLibraryCore.Services;
 using System;
+using System.Collections;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using static SharedLibraryCore.GameEvent;
 
 namespace IW4MAdmin.Application
 {
     public class ApplicationManager : IManager
     {
-        private List<Server> _servers;
+        private readonly ConcurrentBag<Server> _servers;
         public List<Server> Servers => _servers.OrderByDescending(s => s.ClientNum).ToList();
-        public Dictionary<int, EFClient> PrivilegedClients { get; set; }
         public ILogger Logger => GetLogger(0);
         public bool Running { get; private set; }
         public bool IsInitialized { get; private set; }
-        // define what the delagate function looks like
-        public delegate void OnServerEventEventHandler(object sender, GameEventArgs e);
-        // expose the event handler so we can execute the events
-        public OnServerEventEventHandler OnServerEvent { get; set; }
         public DateTime StartTime { get; private set; }
         public string Version => Assembly.GetEntryAssembly().GetName().Version.ToString();
 
         public IList<IRConParser> AdditionalRConParsers { get; }
         public IList<IEventParser> AdditionalEventParsers { get; }
-        public ITokenAuthentication TokenAuthenticator => Authenticator;
-        public ITokenAuthentication Authenticator => _authenticator;
+        public ITokenAuthentication TokenAuthenticator { get; }
+        public CancellationToken CancellationToken => _tokenSource.Token;
         public string ExternalIPAddress { get; private set; }
-
+        public bool IsRestartRequested { get; private set; }
+        public IMiddlewareActionHandler MiddlewareActionHandler { get; private set; } = new MiddlewareActionHandler();
         static ApplicationManager Instance;
-        readonly List<AsyncStatus> TaskStatuses;
-        List<Command> Commands;
-        readonly List<MessageToken> MessageTokens;
-        ClientService ClientSvc;
+        private readonly List<Command> Commands;
+        private readonly List<MessageToken> MessageTokens;
+        private readonly ClientService ClientSvc;
         readonly AliasService AliasSvc;
         readonly PenaltyService PenaltySvc;
         public BaseConfigurationHandler<ApplicationConfiguration> ConfigHandler;
         GameEventHandler Handler;
-        ManualResetEventSlim OnQuit;
         readonly IPageList PageList;
-        readonly SemaphoreSlim ProcessingEvent = new SemaphoreSlim(1, 1);
         readonly Dictionary<long, ILogger> Loggers = new Dictionary<long, ILogger>();
-        readonly ITokenAuthentication _authenticator;
         private readonly MetaService _metaService;
         private readonly TimeSpan _throttleTimeout = new TimeSpan(0, 1, 0);
+        private readonly CancellationTokenSource _tokenSource;
+        private readonly Dictionary<string, Task<IList>> _operationLookup = new Dictionary<string, Task<IList>>();
 
         private ApplicationManager()
         {
-            _servers = new List<Server>();
+            _servers = new ConcurrentBag<Server>();
             Commands = new List<Command>();
-            TaskStatuses = new List<AsyncStatus>();
             MessageTokens = new List<MessageToken>();
             ClientSvc = new ClientService();
             AliasSvc = new AliasService();
             PenaltySvc = new PenaltyService();
             ConfigHandler = new BaseConfigurationHandler<ApplicationConfiguration>("IW4MAdminSettings");
             StartTime = DateTime.UtcNow;
-            OnQuit = new ManualResetEventSlim();
             PageList = new PageList();
             AdditionalEventParsers = new List<IEventParser>();
             AdditionalRConParsers = new List<IRConParser>();
-            OnServerEvent += OnGameEvent;
-            OnServerEvent += EventApi.OnGameEvent;
-            _authenticator = new TokenAuthentication();
+            TokenAuthenticator = new TokenAuthentication();
             _metaService = new MetaService();
+            _tokenSource = new CancellationTokenSource();
         }
 
-        private async void OnGameEvent(object sender, GameEventArgs args)
+        public async Task ExecuteEvent(GameEvent newEvent)
         {
 #if DEBUG == true
-            Logger.WriteDebug($"Entering event process for {args.Event.Id}");
+            Logger.WriteDebug($"Entering event process for {newEvent.Id}");
 #endif
 
-            var newEvent = args.Event;
-
             // the event has failed already
             if (newEvent.Failed)
             {
@@ -103,44 +94,56 @@ namespace IW4MAdmin.Application
 
                 // save the event info to the database
                 var changeHistorySvc = new ChangeHistoryService();
-                await changeHistorySvc.Add(args.Event);
+                await changeHistorySvc.Add(newEvent);
 
 #if DEBUG
                 Logger.WriteDebug($"Processed event with id {newEvent.Id}");
 #endif
             }
 
+            catch (TaskCanceledException)
+            {
+                Logger.WriteInfo($"Received quit signal for event id {newEvent.Id}, so we are aborting early");
+            }
+
+            catch (OperationCanceledException)
+            {
+                Logger.WriteInfo($"Received quit signal for event id {newEvent.Id}, so we are aborting early");
+            }
+
             // this happens if a plugin requires login
             catch (AuthorizationException ex)
             {
-                newEvent.FailReason = GameEvent.EventFailReason.Permission;
+                newEvent.FailReason = EventFailReason.Permission;
                 newEvent.Origin.Tell($"{Utilities.CurrentLocalization.LocalizationIndex["COMMAND_NOTAUTHORIZED"]} - {ex.Message}");
             }
 
             catch (NetworkException ex)
             {
-                newEvent.FailReason = GameEvent.EventFailReason.Exception;
+                newEvent.FailReason = EventFailReason.Exception;
                 Logger.WriteError(ex.Message);
                 Logger.WriteDebug(ex.GetExceptionInfo());
             }
 
             catch (ServerException ex)
             {
-                newEvent.FailReason = GameEvent.EventFailReason.Exception;
+                newEvent.FailReason = EventFailReason.Exception;
                 Logger.WriteWarning(ex.Message);
             }
 
             catch (Exception ex)
             {
-                newEvent.FailReason = GameEvent.EventFailReason.Exception;
+                newEvent.FailReason = EventFailReason.Exception;
                 Logger.WriteError(Utilities.CurrentLocalization.LocalizationIndex["SERVER_ERROR_EXCEPTION"].FormatExt(newEvent.Owner));
                 Logger.WriteDebug(ex.GetExceptionInfo());
             }
 
         skip:
-
             // tell anyone waiting for the output that we're done
-            newEvent.OnProcessed.Set();
+            newEvent.Complete();
+#if DEBUG == true
+            Logger.WriteDebug($"Exiting event process for {newEvent.Id}");
+#endif
         }
 
         public IList<Server> GetServers()
@@ -158,12 +161,12 @@ namespace IW4MAdmin.Application
             return Instance ?? (Instance = new ApplicationManager());
         }
 
-        public async Task UpdateServerStates(CancellationToken token)
+        public async Task UpdateServerStates()
         {
             // store the server hash code and task for it
             var runningUpdateTasks = new Dictionary<long, Task>();
 
-            while (Running)
+            while (!_tokenSource.IsCancellationRequested)
             {
                 // select the server ids that have completed the update task
                 var serverTasksToRemove = runningUpdateTasks
@@ -194,10 +197,11 @@ namespace IW4MAdmin.Application
                     {
                         try
                         {
-                            await server.ProcessUpdatesAsync(token);
+                            await server.ProcessUpdatesAsync(_tokenSource.Token);
+
                             if (server.Throttled)
                             {
-                                await Task.Delay((int)_throttleTimeout.TotalMilliseconds);
+                                await Task.Delay((int)_throttleTimeout.TotalMilliseconds, _tokenSource.Token);
                             }
                         }
 
@@ -221,10 +225,17 @@ namespace IW4MAdmin.Application
 #endif
                 try
                 {
-                    await Task.Delay(ConfigHandler.Configuration().RConPollRate, token);
+                    await Task.Delay(ConfigHandler.Configuration().RConPollRate, _tokenSource.Token);
+                }
+                // if a cancellation is received, we want to return immediately after shutting down
+                catch
+                {
+                    foreach (var server in Servers.Where(s => serverIds.Contains(s.EndPoint)))
+                    {
+                        await server.ProcessUpdatesAsync(_tokenSource.Token);
+                    }
+                    break;
                 }
-                // if a cancellation is received, we want to return immediately
-                catch { break; }
             }
         }
 
@@ -345,8 +356,6 @@ namespace IW4MAdmin.Application
             {
                 await new ContextSeed(db).Seed();
             }
-
-            PrivilegedClients = (await ClientSvc.GetPrivilegedClients()).ToDictionary(_client => _client.ClientId);
             #endregion
 
             #region COMMANDS
@@ -356,6 +365,7 @@ namespace IW4MAdmin.Application
             }
 
             Commands.Add(new CQuit());
+            Commands.Add(new CRestart());
             Commands.Add(new CKick());
             Commands.Add(new CSay());
             Commands.Add(new CTempBan());
@@ -387,12 +397,13 @@ namespace IW4MAdmin.Application
             Commands.Add(new CIP());
             Commands.Add(new CMask());
             Commands.Add(new CPruneAdmins());
-            Commands.Add(new CKillServer());
+            //Commands.Add(new CKillServer());
             Commands.Add(new CSetPassword());
             Commands.Add(new CPing());
             Commands.Add(new CSetGravatar());
             Commands.Add(new CNextMap());
             Commands.Add(new RequestTokenCommand());
+            Commands.Add(new UnlinkClientCommand());
 
             foreach (Command C in SharedLibraryCore.Plugins.PluginImporter.ActiveCommands)
             {
@@ -522,15 +533,18 @@ namespace IW4MAdmin.Application
             MetaService.AddRuntimeMeta(getPenaltyMeta);
             #endregion
 
-            #region INIT
-            int failedServers = 0;
+            await InitializeServers();
+        }
+
+        private async Task InitializeServers()
+        {
+            var config = ConfigHandler.Configuration();
             int successServers = 0;
             Exception lastException = null;
 
             async Task Init(ServerConfiguration Conf)
             {
                 // setup the event handler after the class is initialized
-
                 Handler = new GameEventHandler(this);
 
                 try
@@ -538,10 +552,7 @@ namespace IW4MAdmin.Application
                     var ServerInstance = new IW4MServer(this, Conf);
                     await ServerInstance.Initialize();
 
-                    lock (_servers)
-                    {
-                        _servers.Add(ServerInstance);
-                    }
+                    _servers.Add(ServerInstance);
 
                     Logger.WriteVerbose(Utilities.CurrentLocalization.LocalizationIndex["MANAGER_MONITORING_TEXT"].FormatExt(ServerInstance.Hostname));
                     // add the start event for this server
@@ -563,48 +574,46 @@ namespace IW4MAdmin.Application
 
                     if (e.GetType() == typeof(DvarException))
                     {
-                        Logger.WriteDebug($"{Utilities.CurrentLocalization.LocalizationIndex["SERVER_ERROR_DVAR"].FormatExt((e as DvarException).Data["dvar_name"])} ({Utilities.CurrentLocalization.LocalizationIndex["SERVER_ERROR_DVAR_HELP"]})");
+                        Logger.WriteDebug($"{e.Message} {(e.GetType() == typeof(DvarException) ? $"({Utilities.CurrentLocalization.LocalizationIndex["SERVER_ERROR_DVAR_HELP"]})" : "")}");
                     }
 
-                    else if (e.GetType() == typeof(NetworkException))
-                    {
-                        Logger.WriteDebug(e.Message);
-                    }
-
-                    failedServers++;
                     lastException = e;
                 }
             }
 
             await Task.WhenAll(config.Servers.Select(c => Init(c)).ToArray());
 
-            if (successServers - failedServers <= 0)
+            if (successServers == 0)
+            {
+                throw lastException;
+            }
+
+            if (successServers != config.Servers.Count)
             {
                 if (!Utilities.PromptBool(Utilities.CurrentLocalization.LocalizationIndex["MANAGER_START_WITH_ERRORS"]))
                 {
                     throw lastException;
                 }
             }
-            #endregion
         }
 
-        private async Task SendHeartbeat(object state)
+        private async Task SendHeartbeat()
         {
-            var heartbeatState = (HeartbeatState)state;
+            bool connected = false;
 
-            while (Running)
+            while (!_tokenSource.IsCancellationRequested)
             {
-                if (!heartbeatState.Connected)
+                if (!connected)
                 {
                     try
                     {
                         await Heartbeat.Send(this, true);
-                        heartbeatState.Connected = true;
+                        connected = true;
                     }
 
                     catch (Exception e)
                     {
-                        heartbeatState.Connected = false;
+                        connected = false;
                         Logger.WriteWarning($"Could not connect to heartbeat server - {e.Message}");
                     }
                 }
@@ -630,7 +639,7 @@ namespace IW4MAdmin.Application
                         {
                             if (((RestEase.ApiException)ex).StatusCode == System.Net.HttpStatusCode.Unauthorized)
                             {
-                                heartbeatState.Connected = false;
+                                connected = false;
                             }
                         }
                     }
@@ -640,9 +649,10 @@ namespace IW4MAdmin.Application
                         Logger.WriteWarning($"Could not send heartbeat - {e.Message}");
                         if (e.StatusCode == System.Net.HttpStatusCode.Unauthorized)
                         {
-                            heartbeatState.Connected = false;
+                            connected = false;
                         }
                     }
+
                     catch (Exception e)
                     {
                         Logger.WriteWarning($"Could not send heartbeat - {e.Message}");
@@ -652,31 +662,32 @@ namespace IW4MAdmin.Application
 
                 try
                 {
-                    await Task.Delay(30000, heartbeatState.Token);
+                    await Task.Delay(30000, _tokenSource.Token);
                 }
                 catch { break; }
             }
         }
 
-        public void Start()
+        public async Task Start()
         {
-            var tokenSource = new CancellationTokenSource();
-            // this needs to be run seperately from the main thread
-            _ = Task.Run(() => SendHeartbeat(new HeartbeatState() { Token = tokenSource.Token }));
-            _ = Task.Run(() => UpdateServerStates(tokenSource.Token));
-
-            while (Running)
+            await Task.WhenAll(new[]
             {
-                OnQuit.Wait();
-                tokenSource.Cancel();
-                OnQuit.Reset();
-            }
+                SendHeartbeat(),
+                UpdateServerStates()
+            });
         }
 
         public void Stop()
         {
+            _tokenSource.Cancel();
             Running = false;
-            OnQuit.Set();
+            Instance = null;
+        }
+
+        public void Restart()
+        {
+            IsRestartRequested = true;
+            Stop();
         }
 
         public ILogger GetLogger(long serverId)
@@ -711,7 +722,8 @@ namespace IW4MAdmin.Application
 
         public IList<EFClient> GetActiveClients()
         {
-            return _servers.SelectMany(s => s.Clients).Where(p => p != null).ToList();
+            // we're adding another to list here so we don't get a collection modified exception..
+            return _servers.SelectMany(s => s.Clients).ToList().Where(p => p != null).ToList();
         }
 
         public ClientService GetClientService()
@@ -734,26 +746,11 @@ namespace IW4MAdmin.Application
             return ConfigHandler;
         }
 
-        public IDictionary<int, EFClient> GetPrivilegedClients()
-        {
-            return PrivilegedClients;
-        }
-
-        public bool ShutdownRequested()
-        {
-            return !Running;
-        }
-
         public IEventHandler GetEventHandler()
         {
             return Handler;
         }
 
-        public void SetHasEvent()
-        {
-            
-        }
-
         public IList<Assembly> GetPluginAssemblies()
         {
             return SharedLibraryCore.Plugins.PluginImporter.PluginAssemblies.Union(SharedLibraryCore.Plugins.PluginImporter.Assemblies).ToList();
@@ -773,5 +770,16 @@ namespace IW4MAdmin.Application
         {
             return new DynamicEventParser();
         }
+
+        public async Task<IList<T>> ExecuteSharedDatabaseOperation<T>(string operationName)
+        {
+            var result = await _operationLookup[operationName];
+            return (IList<T>)result;
+        }
+
+        public void RegisterSharedDatabaseOperation(Task<IList> operation, string operationName)
+        {
+            _operationLookup.Add(operationName, operation);
+        }
     }
 }

Application/BuildScripts/PostBuild.bat

@@ -24,11 +24,4 @@ xcopy /Y "%SolutionDir%BUILD\Plugins" "%SolutionDir%Publish\WindowsPrerelease\Pl
 
 echo Copying script plugins for publish
 xcopy /Y "%SolutionDir%Plugins\ScriptPlugins" "%SolutionDir%Publish\Windows\Plugins\"
-xcopy /Y "%SolutionDir%Plugins\ScriptPlugins" "%SolutionDir%Publish\WindowsPrerelease\Plugins\"
-
-echo Copying GSC files for publish
-xcopy /Y  "%SolutionDir%_customcallbacks.gsc" "%SolutionDir%Publish\Windows\userraw\scripts\"
-xcopy /Y "%SolutionDir%_customcallbacks.gsc" "%SolutionDir%Publish\WindowsPrerelease\userraw\scripts\"
-
-xcopy /Y "%SolutionDir%_commands.gsc" "%SolutionDir%Publish\Windows\userraw\scripts\"
-xcopy /Y "%SolutionDir%_commands.gsc" "%SolutionDir%Publish\WindowsPrerelease\userraw\scripts\"
+xcopy /Y "%SolutionDir%Plugins\ScriptPlugins" "%SolutionDir%Publish\WindowsPrerelease\Plugins\"

Application/BuildScripts/PostPublish.bat

@@ -1,115 +1,41 @@
-set SolutionDir=%1
-set ProjectDir=%2
-set TargetDir=%3
-set CurrentConfiguration=%4
+set PublishDir=%1
+set SourceDir=%2
 SET COPYCMD=/Y
 
-echo Deleting extra language files
+echo deleting extra runtime files
+if exist "%PublishDir%\runtimes\linux-arm" powershell Remove-Item -Force -Recurse '%PublishDir%\runtimes\linux-arm'
+if exist "%PublishDir%\runtimes\linux-arm64" powershell Remove-Item -Force -Recurse '%PublishDir%\runtimes\linux-arm64'
+if exist "%PublishDir%\runtimes\linux-armel" powershell Remove-Item -Force -Recurse '%PublishDir%\runtimes\linux-armel'
+if exist "%PublishDir%\runtimes\osx" powershell Remove-Item -Force -Recurse '%PublishDir%\runtimes\osx'
+if exist "%PublishDir%\runtimes\osx-x64" powershell Remove-Item -Force -Recurse '%PublishDir%\runtimes\osx-x64'
+if exist "%PublishDir%\runtimes\win-arm" powershell Remove-Item -Force -Recurse '%PublishDir%\runtimes\win-arm'
+if exist "%PublishDir%\runtimes\win-arm64" powershell Remove-Item -Force -Recurse '%PublishDir%\runtimes\win-arm64'
+if exist "%PublishDir%\runtimes\alpine-x64" powershell Remove-Item -Force -Recurse '%PublishDir%\runtimes\alpine-x64'
+if exist "%PublishDir%\runtimes\linux-musl-x64" powershell Remove-Item -Force -Recurse '%PublishDir%\runtimes\linux-musl-x64'
 
-if exist  "%SolutionDir%Publish\Windows\en-US\" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\Windows\en-US'
-if exist  "%SolutionDir%Publish\Windows\de\" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\Windows\de'
-if exist "%SolutionDir%Publish\Windows\es\" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\Windows\es'
-if exist "%SolutionDir%Publish\Windows\fr\" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\Windows\fr'
-if exist "%SolutionDir%Publish\Windows\it\" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\Windows\it'
-if exist "%SolutionDir%Publish\Windows\ja\" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\Windows\ja'
-if exist "%SolutionDir%Publish\Windows\ko\" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\Windows\ko'
-if exist "%SolutionDir%Publish\Windows\ru\" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\Windows\ru'
-if exist "%SolutionDir%Publish\Windows\zh-Hans\" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\Windows\zh-Hans'
-if exist "%SolutionDir%Publish\Windows\zh-Hant\" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\Windows\zh-Hant'
+echo deleting misc files
+if exist "%PublishDir%\web.config" del "%PublishDir%\web.config"
+if exist "%PublishDir%\libman.json" del "%PublishDir%\libman.json"
+del "%PublishDir%\*.exe"
+del "%PublishDir%\*.pdb"
 
-if exist  "%SolutionDir%Publish\WindowsPrerelease\en-US\" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\WindowsPrerelease\en-US'
-if exist  "%SolutionDir%Publish\WindowsPrerelease\de\" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\WindowsPrerelease\de'
-if exist "%SolutionDir%Publish\WindowsPrerelease\es\" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\WindowsPrerelease\es'
-if exist "%SolutionDir%Publish\WindowsPrerelease\fr\" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\WindowsPrerelease\fr'
-if exist "%SolutionDir%Publish\WindowsPrerelease\it\" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\WindowsPrerelease\it'
-if exist "%SolutionDir%Publish\WindowsPrerelease\ja\" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\WindowsPrerelease\ja'
-if exist "%SolutionDir%Publish\WindowsPrerelease\ko\" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\WindowsPrerelease\ko'
-if exist "%SolutionDir%Publish\WindowsPrerelease\ru\" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\WindowsPrerelease\ru'
-if exist "%SolutionDir%Publish\WindowsPrerelease\zh-Hans\" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\WindowsPrerelease\zh-Hans'
-if exist "%SolutionDir%Publish\WindowsPrerelease\zh-Hant\" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\WindowsPrerelease\zh-Hant'
-
-echo Deleting extra runtime files
-if exist "%SolutionDir%Publish\Windows\runtimes\linux-arm" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\Windows\runtimes\linux-arm'
-if exist "%SolutionDir%Publish\Windows\runtimes\linux-arm64" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\Windows\runtimes\linux-arm64'
-if exist "%SolutionDir%Publish\Windows\runtimes\linux-armel" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\Windows\runtimes\linux-armel'
-
-if exist "%SolutionDir%Publish\Windows\runtimes\osx" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\Windows\runtimes\osx'
-if exist "%SolutionDir%Publish\Windows\runtimes\osx-x64" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\Windows\runtimes\osx-x64'
-
-if exist "%SolutionDir%Publish\Windows\runtimes\win-arm" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\Windows\runtimes\win-arm'
-if exist "%SolutionDir%Publish\Windows\runtimes\win-arm64" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\Windows\runtimes\win-arm64'
-
-if exist "%SolutionDir%Publish\WindowsPrerelease\runtimes\linux-arm" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\WindowsPrerelease\runtimes\linux-arm'
-if exist "%SolutionDir%Publish\WindowsPrerelease\runtimes\linux-arm64" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\WindowsPrerelease\runtimes\linux-arm64'
-if exist "%SolutionDir%Publish\WindowsPrerelease\runtimes\linux-armel" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\WindowsPrerelease\runtimes\linux-armel'
-
-if exist "%SolutionDir%Publish\WindowsPrerelease\runtimes\osx" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\WindowsPrerelease\runtimes\osx'
-if exist "%SolutionDir%Publish\WindowsPrerelease\runtimes\osx-x64" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\WindowsPrerelease\runtimes\osx-x64'
-
-if exist "%SolutionDir%Publish\WindowsPrerelease\runtimes\win-arm" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\WindowsPrerelease\runtimes\win-arm'
-if exist "%SolutionDir%Publish\WindowsPrerelease\runtimes\win-arm64" powershell Remove-Item -Force -Recurse '%SolutionDir%Publish\WindowsPrerelease\runtimes\win-arm64'
-
-echo Deleting misc files
-if exist "%SolutionDir%Publish\Windows\web.config" del "%SolutionDir%Publish\Windows\web.config"
-del "%SolutionDir%Publish\Windows\*pdb"
-
-if exist "%SolutionDir%Publish\WindowsPrerelease\web.config" del "%SolutionDir%Publish\WindowsPrerelease\web.config"
-del "%SolutionDir%Publish\WindowsPrerelease\*pdb"
-
-echo setting up library folders
-
-if "%CurrentConfiguration%" == "Prerelease" (
-	echo PR-Config
-	if not exist  "%SolutionDir%Publish\WindowsPrerelease\Configuration" md "%SolutionDir%Publish\WindowsPrerelease\Configuration"
-	move "%SolutionDir%Publish\WindowsPrerelease\DefaultSettings.json" "%SolutionDir%Publish\WindowsPrerelease\Configuration\"
-)
-
-if "%CurrentConfiguration%" == "Release" (
-	echo R-Config
-	if not exist  "%SolutionDir%Publish\Windows\Configuration" md "%SolutionDir%Publish\Windows\Configuration"
-	if exist "%SolutionDir%Publish\Windows\DefaultSettings.json" move "%SolutionDir%Publish\Windows\DefaultSettings.json" "%SolutionDir%Publish\Windows\Configuration\DefaultSettings.json"
-)
-
-if "%CurrentConfiguration%" == "Prerelease" (
-	echo PR-LIB
-	if not exist "%SolutionDir%Publish\WindowsPrerelease\Lib\" md "%SolutionDir%Publish\WindowsPrerelease\Lib\"
-	move "%SolutionDir%Publish\WindowsPrerelease\*.dll" "%SolutionDir%Publish\WindowsPrerelease\Lib\"
-	move "%SolutionDir%Publish\WindowsPrerelease\*.json" "%SolutionDir%Publish\WindowsPrerelease\Lib\"
-)
-
-if "%CurrentConfiguration%" == "Release" (
-	echo R-LIB
-	if not exist "%SolutionDir%Publish\Windows\Lib\" md "%SolutionDir%Publish\Windows\Lib\"
-	move "%SolutionDir%Publish\Windows\*.dll" "%SolutionDir%Publish\Windows\Lib\"
-	move "%SolutionDir%Publish\Windows\*.json" "%SolutionDir%Publish\Windows\Lib\"
-)
-
-if "%CurrentConfiguration%" == "Prerelease" (
-	echo PR-RT
-	move "%SolutionDir%Publish\WindowsPrerelease\runtimes" "%SolutionDir%Publish\WindowsPrerelease\Lib\runtimes"
-	if exist "%SolutionDir%Publish\WindowsPrerelease\refs" move "%SolutionDir%Publish\WindowsPrerelease\refs" "%SolutionDir%Publish\WindowsPrerelease\Lib\refs"
-)
-
-
-if "%CurrentConfiguration%" == "Release" (
-	echo R-RT
-	move "%SolutionDir%Publish\Windows\runtimes" "%SolutionDir%Publish\Windows\Lib\runtimes"
-	if exist "%SolutionDir%Publish\Windows\refs" move "%SolutionDir%Publish\Windows\refs" "%SolutionDir%Publish\Windows\Lib\refs"
-)
-
-if "%CurrentConfiguration%" == "Prerelease" (
-	echo PR-LOC
-	if not exist  "%SolutionDir%Publish\WindowsPrerelease\Localization" md "%SolutionDir%Publish\WindowsPrerelease\Localization"
-)
-
-if "%CurrentConfiguration%" == "Release" (
-	echo R-LOC
-	if not exist  "%SolutionDir%Publish\Windows\Localization" md "%SolutionDir%Publish\Windows\Localization"
-)
+echo setting up default folders
+if not exist "%PublishDir%\Configuration" md "%PublishDir%\Configuration"
+move "%PublishDir%\DefaultSettings.json" "%PublishDir%\Configuration\"
+if not exist "%PublishDir%\Lib\" md "%PublishDir%\Lib\"
+move "%PublishDir%\*.dll" "%PublishDir%\Lib\"
+move "%PublishDir%\*.json" "%PublishDir%\Lib\"
+move "%PublishDir%\runtimes" "%PublishDir%\Lib\runtimes"
+if exist "%PublishDir%\refs" move "%PublishDir%\refs" "%PublishDir%\Lib\refs"
 
 echo making start scripts
-@(echo @echo off && echo @title IW4MAdmin && echo dotnet Lib\IW4MAdmin.dll && echo pause) > "%SolutionDir%Publish\WindowsPrerelease\StartIW4MAdmin.cmd"
-@(echo @echo off && echo @title IW4MAdmin && echo dotnet Lib\IW4MAdmin.dll && echo pause) > "%SolutionDir%Publish\Windows\StartIW4MAdmin.cmd"
+@(echo @echo off && echo @title IW4MAdmin && echo set DOTNET_CLI_TELEMETRY_OPTOUT=1 && echo dotnet Lib\IW4MAdmin.dll && echo pause) > "%PublishDir%\StartIW4MAdmin.cmd"
+@(echo #!/bin/bash&& echo export DOTNET_CLI_TELEMETRY_OPTOUT=1&& echo dotnet Lib/IW4MAdmin.dll) > "%PublishDir%\StartIW4MAdmin.sh"
 
-@(echo #!/bin/bash && echo dotnet Lib/IW4MAdmin.dll) > "%SolutionDir%Publish\WindowsPrerelease\StartIW4MAdmin.sh"
-@(echo #!/bin/bash && echo dotnet Lib/IW4MAdmin.dll) > "%SolutionDir%Publish\Windows\StartIW4MAdmin.sh"
+echo moving front-end library dependencies
+if not exist "%PublishDir%\wwwroot\font" mkdir "%PublishDir%\wwwroot\font"
+move "WebfrontCore\wwwroot\lib\open-iconic\font\fonts\*.*" "%PublishDir%\wwwroot\font\"
+if exist "%PublishDir%\wwwroot\lib" rd /s /q "%PublishDir%\wwwroot\lib"
+
+echo setting permissions...
+cacls "%PublishDir%" /t /e /p Everyone:F

Application/DefaultSettings.json

@@ -16,7 +16,7 @@
     "Keep grenade launcher use to a minimum",
     "Balance teams at ALL times"
   ],
-  "DisallowedClientNames": ["Unknown Soldier", "VickNet", "UnknownSoldier", "CHEATER"],
+  "DisallowedClientNames": [ "Unknown Soldier", "VickNet", "UnknownSoldier", "CHEATER", "Play77" ],
   "QuickMessages": [
     {
       "Game": "IW4",
@@ -517,6 +517,10 @@
           "Alias": "Hanoi",
           "Name": "mp_hanoi"
         },
+        {
+          "Alias": "Havana",
+          "Name":  "mp_cairo"
+        },
         {
           "Alias": "Hazard",
           "Name": "mp_golfcourse"

Application/EventParsers/BaseEventParser.cs

@@ -36,7 +36,7 @@ namespace IW4MAdmin.Application.EventParsers
             Configuration.Join.AddMapping(ParserRegex.GroupType.OriginClientNumber, 3);
             Configuration.Join.AddMapping(ParserRegex.GroupType.OriginName, 4);
 
-            Configuration.Damage.Pattern = @"^(D);(-?[A-Fa-f0-9_]{1,32}|bot[0-9]+);(-?[0-9]+);(axis|allies|world);(.{1,24});(-?[A-Fa-f0-9_]{1,32}|bot[0-9]+)?;-?([0-9]+);(axis|allies|world);(.{1,24})?;((?:[0-9]+|[a-z]+|_)+);([0-9]+);((?:[A-Z]|_)+);((?:[a-z]|_)+)$";
+            Configuration.Damage.Pattern = @"^(D);(-?[A-Fa-f0-9_]{1,32}|bot[0-9]+);(-?[0-9]+);(axis|allies|world)?;(.{1,24});(-?[A-Fa-f0-9_]{1,32}|bot[0-9]+)?;-?([0-9]+);(axis|allies|world)?;(.{1,24})?;((?:[0-9]+|[a-z]+|_)+);([0-9]+);((?:[A-Z]|_)+);((?:[a-z]|_)+)$";
             Configuration.Damage.AddMapping(ParserRegex.GroupType.EventType, 1);
             Configuration.Damage.AddMapping(ParserRegex.GroupType.TargetNetworkId, 2);
             Configuration.Damage.AddMapping(ParserRegex.GroupType.TargetClientNumber, 3);
@@ -51,7 +51,7 @@ namespace IW4MAdmin.Application.EventParsers
             Configuration.Damage.AddMapping(ParserRegex.GroupType.MeansOfDeath, 12);
             Configuration.Damage.AddMapping(ParserRegex.GroupType.HitLocation, 13);
 
-            Configuration.Kill.Pattern = @"^(K);(-?[A-Fa-f0-9_]{1,32}|bot[0-9]+);(-?[0-9]+);(axis|allies|world);(.{1,24});(-?[A-Fa-f0-9_]{1,32}|bot[0-9]+)?;-?([0-9]+);(axis|allies|world);(.{1,24})?;((?:[0-9]+|[a-z]+|_)+);([0-9]+);((?:[A-Z]|_)+);((?:[a-z]|_)+)$";
+            Configuration.Kill.Pattern = @"^(K);(-?[A-Fa-f0-9_]{1,32}|bot[0-9]+);(-?[0-9]+);(axis|allies|world)?;(.{1,24});(-?[A-Fa-f0-9_]{1,32}|bot[0-9]+)?;-?([0-9]+);(axis|allies|world)?;(.{1,24})?;((?:[0-9]+|[a-z]+|_)+);([0-9]+);((?:[A-Z]|_)+);((?:[a-z]|_)+)$";
             Configuration.Kill.AddMapping(ParserRegex.GroupType.EventType, 1);
             Configuration.Kill.AddMapping(ParserRegex.GroupType.TargetNetworkId, 2);
             Configuration.Kill.AddMapping(ParserRegex.GroupType.TargetClientNumber, 3);
@@ -75,26 +75,12 @@ namespace IW4MAdmin.Application.EventParsers
 
         public string URLProtocolFormat { get; set; } = "CoD://{{ip}}:{{port}}";
 
-        public virtual GameEvent GetEvent(Server server, string logLine)
+        public virtual GameEvent GenerateGameEvent(string logLine)
         {
             logLine = Regex.Replace(logLine, @"([0-9]+:[0-9]+ |^[0-9]+ )", "").Trim();
             string[] lineSplit = logLine.Split(';');
             string eventType = lineSplit[0];
 
-            if (eventType == "JoinTeam")
-            {
-                var origin = server.GetClientsAsList()
-                    .FirstOrDefault(c => c.NetworkId == lineSplit[1].ConvertLong());
-
-                return new GameEvent()
-                {
-                    Type = GameEvent.EventType.JoinTeam,
-                    Data = logLine,
-                    Origin = origin,
-                    Owner = server
-                };
-            }
-
             if (eventType == "say" || eventType == "sayteam")
             {
                 var matchResult = Regex.Match(logLine, Configuration.Say.Pattern);
@@ -107,160 +93,98 @@ namespace IW4MAdmin.Application.EventParsers
                         .Replace("\x15", "")
                         .Trim();
 
-                    var origin = server.GetClientsAsList()
-                        .First(c => c.NetworkId == matchResult.Groups[Configuration.Say.GroupMapping[ParserRegex.GroupType.OriginNetworkId]].ToString().ConvertLong());
-
-                    if (message[0] == '!' || message[0] == '@')
+                    if (message.Length > 0)
                     {
+                        long originId = matchResult.Groups[Configuration.Say.GroupMapping[ParserRegex.GroupType.OriginNetworkId]].ToString().ConvertGuidToLong();
+
+                        if (message[0] == '!' || message[0] == '@')
+                        {
+                            return new GameEvent()
+                            {
+                                Type = GameEvent.EventType.Command,
+                                Data = message,
+                                Origin = new EFClient() { NetworkId = originId },
+                                Message = message,
+                                Extra = logLine,
+                                RequiredEntity = GameEvent.EventRequiredEntity.Origin
+                            };
+                        }
+
                         return new GameEvent()
                         {
-                            Type = GameEvent.EventType.Command,
+                            Type = GameEvent.EventType.Say,
                             Data = message,
-                            Origin = origin,
-                            Owner = server,
-                            Message = message
+                            Origin = new EFClient() { NetworkId = originId },
+                            Message = message,
+                            Extra = logLine,
+                            RequiredEntity = GameEvent.EventRequiredEntity.Origin
                         };
                     }
-
-                    return new GameEvent()
-                    {
-                        Type = GameEvent.EventType.Say,
-                        Data = message,
-                        Origin = origin,
-                        Owner = server,
-                        Message = message
-                    };
                 }
             }
 
             if (eventType == "K")
             {
-                if (!server.CustomCallback)
+                var match = Regex.Match(logLine, Configuration.Kill.Pattern);
+
+                if (match.Success)
                 {
-                    var match = Regex.Match(logLine, Configuration.Kill.Pattern);
+                    long originId = match.Groups[Configuration.Kill.GroupMapping[ParserRegex.GroupType.OriginNetworkId]].Value.ToString().ConvertGuidToLong(1);
+                    long targetId = match.Groups[Configuration.Kill.GroupMapping[ParserRegex.GroupType.TargetNetworkId]].Value.ToString().ConvertGuidToLong(1);
 
-                    if (match.Success)
+                    return new GameEvent()
                     {
-                        string originId = match.Groups[Configuration.Kill.GroupMapping[ParserRegex.GroupType.OriginNetworkId]].Value.ToString();
-                        string targetId = match.Groups[Configuration.Kill.GroupMapping[ParserRegex.GroupType.TargetNetworkId]].Value.ToString();
-
-                        var origin = !string.IsNullOrEmpty(originId) ? server.GetClientsAsList()
-                                .First(c => c.NetworkId == originId.ConvertLong()) :
-                                Utilities.IW4MAdminClient(server);
-
-                        var target = !string.IsNullOrEmpty(targetId) ? server.GetClientsAsList()
-                                .First(c => c.NetworkId == targetId.ConvertLong()) :
-                                Utilities.IW4MAdminClient(server);
-
-                        return new GameEvent()
-                        {
-                            Type = GameEvent.EventType.Kill,
-                            Data = logLine,
-                            Origin = origin,
-                            Target = target,
-                            Owner = server
-                        };
-                    }
+                        Type = GameEvent.EventType.Kill,
+                        Data = logLine,
+                        Origin = new EFClient() { NetworkId = originId },
+                        Target = new EFClient() { NetworkId = targetId },
+                        RequiredEntity = GameEvent.EventRequiredEntity.Origin | GameEvent.EventRequiredEntity.Target
+                    };
                 }
             }
 
-            if (eventType == "ScriptKill")
-            {
-                long originId = lineSplit[1].ConvertLong();
-                long targetId = lineSplit[2].ConvertLong();
-
-                var origin = originId == long.MinValue ? Utilities.IW4MAdminClient(server) :
-                    server.GetClientsAsList().First(c => c.NetworkId == originId);
-                var target = targetId == long.MinValue ? Utilities.IW4MAdminClient(server) :
-                    server.GetClientsAsList().FirstOrDefault(c => c.NetworkId == targetId) ?? Utilities.IW4MAdminClient(server);
-
-                return new GameEvent()
-                {
-                    Type = GameEvent.EventType.ScriptKill,
-                    Data = logLine,
-                    Origin = origin,
-                    Target = target,
-                    Owner = server
-                };
-            }
-
-            if (eventType == "ScriptDamage")
-            {
-                long originId = lineSplit[1].ConvertLong();
-                long targetId = lineSplit[2].ConvertLong();
-
-                var origin = originId == long.MinValue ? Utilities.IW4MAdminClient(server) :
-                    server.GetClientsAsList().First(c => c.NetworkId == originId);
-                var target = targetId == long.MinValue ? Utilities.IW4MAdminClient(server) :
-                    server.GetClientsAsList().FirstOrDefault(c => c.NetworkId == targetId) ?? Utilities.IW4MAdminClient(server);
-
-                return new GameEvent()
-                {
-                    Type = GameEvent.EventType.ScriptDamage,
-                    Data = logLine,
-                    Origin = origin,
-                    Target = target,
-                    Owner = server
-                };
-            }
-
-            // damage
             if (eventType == "D")
             {
-                if (!server.CustomCallback)
+                var regexMatch = Regex.Match(logLine, Configuration.Damage.Pattern);
+
+                if (regexMatch.Success)
                 {
-                    var regexMatch = Regex.Match(logLine, Configuration.Damage.Pattern);
+                    long originId = regexMatch.Groups[Configuration.Damage.GroupMapping[ParserRegex.GroupType.OriginNetworkId]].ToString().ConvertGuidToLong(1);
+                    long targetId = regexMatch.Groups[Configuration.Damage.GroupMapping[ParserRegex.GroupType.TargetNetworkId]].ToString().ConvertGuidToLong(1);
 
-                    if (regexMatch.Success)
+                    return new GameEvent()
                     {
-                        string originId = regexMatch.Groups[Configuration.Damage.GroupMapping[ParserRegex.GroupType.OriginNetworkId]].ToString();
-                        string targetId = regexMatch.Groups[Configuration.Damage.GroupMapping[ParserRegex.GroupType.TargetNetworkId]].ToString();
-
-                        var origin = !string.IsNullOrEmpty(originId) ? server.GetClientsAsList()
-                            .First(c => c.NetworkId == originId.ConvertLong()) :
-                            Utilities.IW4MAdminClient(server);
-
-                        var target = !string.IsNullOrEmpty(targetId) ? server.GetClientsAsList()
-                            .First(c => c.NetworkId == targetId.ConvertLong()) :
-                            Utilities.IW4MAdminClient(server);
-
-                        return new GameEvent()
-                        {
-                            Type = GameEvent.EventType.Damage,
-                            Data = logLine,
-                            Origin = origin,
-                            Target = target,
-                            Owner = server
-                        };
-                    }
+                        Type = GameEvent.EventType.Damage,
+                        Data = logLine,
+                        Origin = new EFClient() { NetworkId = originId },
+                        Target = new EFClient() { NetworkId = targetId },
+                        RequiredEntity = GameEvent.EventRequiredEntity.Origin | GameEvent.EventRequiredEntity.Target
+                    };
                 }
             }
 
-            // join
             if (eventType == "J")
             {
                 var regexMatch = Regex.Match(logLine, Configuration.Join.Pattern);
+
                 if (regexMatch.Success)
                 {
-                    bool isBot = regexMatch.Groups[Configuration.Join.GroupMapping[ParserRegex.GroupType.OriginNetworkId]].ToString().Contains("bot");
-
                     return new GameEvent()
                     {
                         Type = GameEvent.EventType.PreConnect,
                         Data = logLine,
-                        Owner = server,
                         Origin = new EFClient()
                         {
                             CurrentAlias = new EFAlias()
                             {
-                                Name = regexMatch.Groups[Configuration.Join.GroupMapping[ParserRegex.GroupType.OriginName]].ToString().StripColors(),
+                                Name = regexMatch.Groups[Configuration.Join.GroupMapping[ParserRegex.GroupType.OriginName]].ToString(),
                             },
-                            NetworkId = regexMatch.Groups[Configuration.Join.GroupMapping[ParserRegex.GroupType.OriginNetworkId]].ToString().ConvertLong(),
+                            NetworkId = regexMatch.Groups[Configuration.Join.GroupMapping[ParserRegex.GroupType.OriginNetworkId]].ToString().ConvertGuidToLong(),
                             ClientNumber = Convert.ToInt32(regexMatch.Groups[Configuration.Join.GroupMapping[ParserRegex.GroupType.OriginClientNumber]].ToString()),
                             State = EFClient.ClientState.Connecting,
-                            CurrentServer = server,
-                            IsBot = isBot
-                        }
+                        },
+                        RequiredEntity = GameEvent.EventRequiredEntity.None,
+                        IsBlocking = true
                     };
                 }
             }
@@ -274,17 +198,18 @@ namespace IW4MAdmin.Application.EventParsers
                     {
                         Type = GameEvent.EventType.PreDisconnect,
                         Data = logLine,
-                        Owner = server,
                         Origin = new EFClient()
                         {
                             CurrentAlias = new EFAlias()
                             {
-                                Name = regexMatch.Groups[Configuration.Quit.GroupMapping[ParserRegex.GroupType.OriginName]].ToString().StripColors()
+                                Name = regexMatch.Groups[Configuration.Quit.GroupMapping[ParserRegex.GroupType.OriginName]].ToString()
                             },
-                            NetworkId = regexMatch.Groups[Configuration.Quit.GroupMapping[ParserRegex.GroupType.OriginNetworkId]].ToString().ConvertLong(),
+                            NetworkId = regexMatch.Groups[Configuration.Quit.GroupMapping[ParserRegex.GroupType.OriginNetworkId]].ToString().ConvertGuidToLong(),
                             ClientNumber = Convert.ToInt32(regexMatch.Groups[Configuration.Quit.GroupMapping[ParserRegex.GroupType.OriginClientNumber]].ToString()),
                             State = EFClient.ClientState.Disconnecting
-                        }
+                        },
+                        RequiredEntity = GameEvent.EventRequiredEntity.None,
+                        IsBlocking = true
                     };
                 }
             }
@@ -294,10 +219,10 @@ namespace IW4MAdmin.Application.EventParsers
                 return new GameEvent()
                 {
                     Type = GameEvent.EventType.MapEnd,
-                    Data = lineSplit[0],
-                    Origin = Utilities.IW4MAdminClient(server),
-                    Target = Utilities.IW4MAdminClient(server),
-                    Owner = server
+                    Data = logLine,
+                    Origin = Utilities.IW4MAdminClient(),
+                    Target = Utilities.IW4MAdminClient(),
+                    RequiredEntity = GameEvent.EventRequiredEntity.None
                 };
             }
 
@@ -308,20 +233,66 @@ namespace IW4MAdmin.Application.EventParsers
                 return new GameEvent()
                 {
                     Type = GameEvent.EventType.MapChange,
-                    Data = lineSplit[0],
-                    Origin = Utilities.IW4MAdminClient(server),
-                    Target = Utilities.IW4MAdminClient(server),
-                    Owner = server,
-                    Extra = dump.DictionaryFromKeyValue()
+                    Data = logLine,
+                    Origin = Utilities.IW4MAdminClient(),
+                    Target = Utilities.IW4MAdminClient(),
+                    Extra = dump.DictionaryFromKeyValue(),
+                    RequiredEntity = GameEvent.EventRequiredEntity.None
+                };
+            }
+
+            // this is a custom event printed out by _customcallbacks.gsc (used for team balance)
+            if (eventType == "JoinTeam")
+            {
+                return new GameEvent()
+                {
+                    Type = GameEvent.EventType.JoinTeam,
+                    Data = logLine,
+                    Origin = new EFClient() { NetworkId = lineSplit[1].ConvertGuidToLong() },
+                    RequiredEntity = GameEvent.EventRequiredEntity.Target
+                };
+            }
+
+            // this is a custom event printed out by _customcallbacks.gsc (used for anticheat)
+            if (eventType == "ScriptKill")
+            {
+                
+                long originId = lineSplit[1].ConvertGuidToLong(1);
+                long targetId = lineSplit[2].ConvertGuidToLong(1);
+
+                return new GameEvent()
+                {
+                    Type = GameEvent.EventType.ScriptKill,
+                    Data = logLine,
+                    Origin = new EFClient() { NetworkId = originId },
+                    Target = new EFClient() { NetworkId = targetId },
+                    RequiredEntity = GameEvent.EventRequiredEntity.Origin | GameEvent.EventRequiredEntity.Target
+                };
+            }
+
+            // this is a custom event printed out by _customcallbacks.gsc (used for anticheat)
+            if (eventType == "ScriptDamage")
+            {
+                long originId = lineSplit[1].ConvertGuidToLong(1);
+                long targetId = lineSplit[2].ConvertGuidToLong(1);
+
+                return new GameEvent()
+                {
+                    Type = GameEvent.EventType.ScriptDamage,
+                    Data = logLine,
+                    Origin = new EFClient() { NetworkId = originId },
+                    Target = new EFClient() { NetworkId = targetId },
+                    RequiredEntity = GameEvent.EventRequiredEntity.Origin | GameEvent.EventRequiredEntity.Target
                 };
             }
 
             return new GameEvent()
             {
                 Type = GameEvent.EventType.Unknown,
-                Origin = Utilities.IW4MAdminClient(server),
-                Target = Utilities.IW4MAdminClient(server),
-                Owner = server
+                Data = logLine,
+                Origin = Utilities.IW4MAdminClient(),
+                Target = Utilities.IW4MAdminClient(),
+                RequiredEntity = GameEvent.EventRequiredEntity.None
             };
         }
     }

Application/GameEventHandler.cs

@@ -1,7 +1,8 @@
-using SharedLibraryCore;
+using IW4MAdmin.Application.Misc;
+using SharedLibraryCore;
 using SharedLibraryCore.Events;
 using SharedLibraryCore.Interfaces;
-using System.Collections.Generic;
+using System;
 using System.Linq;
 using System.Threading;
 
@@ -9,15 +10,57 @@ namespace IW4MAdmin.Application
 {
     class GameEventHandler : IEventHandler
     {
-        readonly IManager Manager;
+        readonly ApplicationManager Manager;
+        private readonly EventProfiler _profiler;
+        private delegate void GameEventAddedEventHandler(object sender, GameEventArgs args);
+        private event GameEventAddedEventHandler GameEventAdded;
+
+        private static readonly GameEvent.EventType[] overrideEvents = new[]
+        {
+            GameEvent.EventType.Connect,
+            GameEvent.EventType.Disconnect,
+            GameEvent.EventType.Quit,
+            GameEvent.EventType.Stop
+        };
+
         public GameEventHandler(IManager mgr)
         {
-            Manager = mgr;
+            Manager = (ApplicationManager)mgr;
+            _profiler = new EventProfiler(mgr.GetLogger(0));
+            GameEventAdded += GameEventHandler_GameEventAdded;
+        }
+
+        private async void GameEventHandler_GameEventAdded(object sender, GameEventArgs args)
+        {
+            var start = DateTime.Now;
+            await Manager.ExecuteEvent(args.Event);
+            EventApi.OnGameEvent(sender, args);
+#if DEBUG
+            _profiler.Profile(start, DateTime.Now, args.Event);
+#endif
         }
 
         public void AddEvent(GameEvent gameEvent)
         {
-            ((Manager as ApplicationManager).OnServerEvent)(this, new GameEventArgs(null, false, gameEvent));
+#if DEBUG
+            ThreadPool.GetMaxThreads(out int workerThreads, out int n);
+            ThreadPool.GetAvailableThreads(out int availableThreads, out int m);
+            gameEvent.Owner.Logger.WriteDebug($"There are {workerThreads - availableThreads} active threading tasks");
+
+#endif
+            if (Manager.Running || overrideEvents.Contains(gameEvent.Type))
+            {
+#if DEBUG
+                gameEvent.Owner.Logger.WriteDebug($"Adding event with id {gameEvent.Id}");
+#endif
+                GameEventAdded?.Invoke(this, new GameEventArgs(null, false, gameEvent));
+            }
+#if DEBUG
+            else
+            {
+                gameEvent.Owner.Logger.WriteDebug($"Skipping event as we're shutting down {gameEvent.Id}");
+            }
+#endif
         }
     }
 }

Application/IO/GameLogEventDetection.cs

@@ -1,17 +1,18 @@
 using SharedLibraryCore;
 using SharedLibraryCore.Interfaces;
 using System;
-using System.Threading;
+using System.Linq;
 using System.Threading.Tasks;
 
 namespace IW4MAdmin.Application.IO
 {
     class GameLogEventDetection
     {
-        Server Server;
-        long PreviousFileSize;
-        IGameLogReader Reader;
-        readonly string GameLogFile;
+        private long previousFileSize;
+        private readonly Server _server;
+        private readonly IGameLogReader _reader;
+        private readonly string _gameLogFile;
+        private readonly bool _ignoreBots;
 
         class EventState
         {
@@ -21,16 +22,17 @@ namespace IW4MAdmin.Application.IO
 
         public GameLogEventDetection(Server server, string gameLogPath, Uri gameLogServerUri)
         {
-            GameLogFile = gameLogPath;
-            Reader = gameLogServerUri != null ? new GameLogReaderHttp(gameLogServerUri, gameLogPath, server.EventParser) : Reader = new GameLogReader(gameLogPath, server.EventParser); 
-            Server = server;
+            _gameLogFile = gameLogPath;
+            _reader = gameLogServerUri != null ? new GameLogReaderHttp(gameLogServerUri, gameLogPath, server.EventParser) : _reader = new GameLogReader(gameLogPath, server.EventParser);
+            _server = server;
+            _ignoreBots = server.Manager.GetApplicationSettings().Configuration().IgnoreBots;
         }
 
         public async Task PollForChanges()
         {
-            while (!Server.Manager.ShutdownRequested())
+            while (!_server.Manager.CancellationToken.IsCancellationRequested)
             {
-                if (Server.IsInitialized)
+                if (_server.IsInitialized)
                 {
                     try
                     {
@@ -39,39 +41,81 @@ namespace IW4MAdmin.Application.IO
 
                     catch (Exception e)
                     {
-                        Server.Logger.WriteWarning($"Failed to update log event for {Server.EndPoint}");
-                        Server.Logger.WriteDebug($"Exception: {e.Message}");
-                        Server.Logger.WriteDebug($"StackTrace: {e.StackTrace}");
+                        _server.Logger.WriteWarning($"Failed to update log event for {_server.EndPoint}");
+                        _server.Logger.WriteDebug(e.GetExceptionInfo());
                     }
                 }
-                Thread.Sleep(Reader.UpdateInterval);
+
+                await Task.Delay(_reader.UpdateInterval, _server.Manager.CancellationToken);
             }
+
+            _server.Logger.WriteDebug("Stopped polling for changes");
         }
 
         private async Task UpdateLogEvents()
         {
-            long fileSize = Reader.Length;
+            long fileSize = _reader.Length;
 
-            if (PreviousFileSize == 0)
-                PreviousFileSize = fileSize;
+            if (previousFileSize == 0)
+            {
+                previousFileSize = fileSize;
+            }
 
-            long fileDiff = fileSize - PreviousFileSize;
+            long fileDiff = fileSize - previousFileSize;
 
             // this makes the http log get pulled
             if (fileDiff < 1 && fileSize != -1)
                 return;
 
-            PreviousFileSize = fileSize;
+            var events = await _reader.ReadEventsFromLog(_server, fileDiff, previousFileSize);
 
-            var events = await Reader.ReadEventsFromLog(Server, fileDiff, 0);
-
-            foreach (var ev in events)
+            foreach (var gameEvent in events)
             {
-                Server.Manager.GetEventHandler().AddEvent(ev);
-                await ev.WaitAsync();
+                try
+                {
+#if DEBUG
+                    _server.Logger.WriteVerbose(gameEvent.Data);
+#endif
+                    gameEvent.Owner = _server;
+
+                    // we don't want to add the event if ignoreBots is on and the event comes from a bot
+                    if (!_ignoreBots || (_ignoreBots && !((gameEvent.Origin?.IsBot ?? false) || (gameEvent.Target?.IsBot ?? false))))
+                    {
+                        if ((gameEvent.RequiredEntity & GameEvent.EventRequiredEntity.Origin) == GameEvent.EventRequiredEntity.Origin && gameEvent.Origin.NetworkId != 1)
+                        {
+                            gameEvent.Origin = _server.GetClientsAsList().First(_client => _client.NetworkId == gameEvent.Origin?.NetworkId);
+                        }
+
+                        if ((gameEvent.RequiredEntity & GameEvent.EventRequiredEntity.Target) == GameEvent.EventRequiredEntity.Target)
+                        {
+                            gameEvent.Target = _server.GetClientsAsList().First(_client => _client.NetworkId == gameEvent.Target?.NetworkId);
+                        }
+
+                        if (gameEvent.Origin != null)
+                        {
+                            gameEvent.Origin.CurrentServer = _server;
+                        }
+
+                        if (gameEvent.Target != null)
+                        {
+                            gameEvent.Target.CurrentServer = _server;
+                        }
+
+                        _server.Manager.GetEventHandler().AddEvent(gameEvent);
+                    }
+                }
+
+                catch (InvalidOperationException)
+                {
+                    if (!_ignoreBots)
+                    {
+                        _server.Logger.WriteWarning("Could not find client in client list when parsing event line");
+                        _server.Logger.WriteDebug(gameEvent.Data);
+                    }
+                }
             }
 
-            PreviousFileSize = fileSize;
+            previousFileSize = fileSize;
         }
     }
 }

Application/IO/GameLogReader.cs

@@ -3,6 +3,7 @@ using SharedLibraryCore.Interfaces;
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
@@ -10,17 +11,17 @@ namespace IW4MAdmin.Application.IO
 {
     class GameLogReader : IGameLogReader
     {
-        IEventParser Parser;
-        readonly string LogFile;
+        private readonly IEventParser _parser;
+        private readonly string _logFile;
 
-        public long Length => new FileInfo(LogFile).Length;
+        public long Length => new FileInfo(_logFile).Length;
 
         public int UpdateInterval => 300;
 
         public GameLogReader(string logFile, IEventParser parser)
         {
-            LogFile = logFile;
-            Parser = parser;
+            _logFile = logFile;
+            _parser = parser;
         }
 
         public async Task<ICollection<GameEvent>> ReadEventsFromLog(Server server, long fileSizeDiff, long startPosition)
@@ -29,38 +30,50 @@ namespace IW4MAdmin.Application.IO
             List<string> logLines = new List<string>();
 
             // open the file as a stream
-            using (var rd = new StreamReader(new FileStream(LogFile, FileMode.Open, FileAccess.Read, FileShare.ReadWrite), Utilities.EncodingType))
+            using (FileStream fs = new FileStream(_logFile, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
             {
-                // todo: max async
-                // take the old start position and go back the number of new characters
-                rd.BaseStream.Seek(-fileSizeDiff, SeekOrigin.End);
-                
-                string newLine;
-                while (!string.IsNullOrEmpty(newLine = await rd.ReadLineAsync()))
+                byte[] buff = new byte[fileSizeDiff];
+                fs.Seek(startPosition, SeekOrigin.Begin);
+                await fs.ReadAsync(buff, 0, (int)fileSizeDiff, server.Manager.CancellationToken);
+                var stringBuilder = new StringBuilder();
+                char[] charBuff = Utilities.EncodingType.GetChars(buff);
+
+                foreach (char c in charBuff)
                 {
-                    logLines.Add(newLine);
+                    if (c == '\n')
+                    {
+                        logLines.Add(stringBuilder.ToString());
+                        stringBuilder = new StringBuilder();
+                    }
+
+                    else if (c != '\r')
+                    {
+                        stringBuilder.Append(c);
+                    }
+                }
+
+                if (stringBuilder.Length > 0)
+                {
+                    logLines.Add(stringBuilder.ToString());
                 }
             }
 
             List<GameEvent> events = new List<GameEvent>();
 
             // parse each line
-            foreach (string eventLine in logLines)
+            foreach (string eventLine in logLines.Where(_line => _line.Length > 0))
             {
-                if (eventLine.Length > 0)
+                try
                 {
-                    try
-                    {
-                        // todo: catch elsewhere
-                        events.Add(Parser.GetEvent(server, eventLine));
-                    }
-                    
-                    catch (Exception e)
-                    {
-                        server.Logger.WriteWarning("Could not properly parse event line");
-                        server.Logger.WriteDebug(e.Message);
-                        server.Logger.WriteDebug(eventLine);
-                    }
+                    var gameEvent = _parser.GenerateGameEvent(eventLine);
+                    events.Add(gameEvent);
+                }
+
+                catch (Exception e)
+                {
+                    server.Logger.WriteWarning("Could not properly parse event line");
+                    server.Logger.WriteDebug(e.Message);
+                    server.Logger.WriteDebug(eventLine);
                 }
             }
 

Application/IO/GameLogReaderHttp.cs

@@ -4,6 +4,7 @@ using SharedLibraryCore;
 using SharedLibraryCore.Interfaces;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
 using static SharedLibraryCore.Utilities;
@@ -18,6 +19,7 @@ namespace IW4MAdmin.Application.IO
         readonly IEventParser Parser;
         readonly IGameLogServer Api;
         readonly string logPath;
+        private string lastKey = "next";
 
         public GameLogReaderHttp(Uri gameLogServerUri, string logPath, IEventParser parser)
         {
@@ -28,40 +30,40 @@ namespace IW4MAdmin.Application.IO
 
         public long Length => -1;
 
-        public int UpdateInterval => 350;
+        public int UpdateInterval => 500;
 
         public async Task<ICollection<GameEvent>> ReadEventsFromLog(Server server, long fileSizeDiff, long startPosition)
         {
-#if DEBUG == true
-            server.Logger.WriteDebug($"Begin reading from http log");
-#endif
             var events = new List<GameEvent>();
             string b64Path = logPath;
-            var response = await Api.Log(b64Path);
+            var response = await Api.Log(b64Path, lastKey);
+            lastKey = response.NextKey;
 
-            if (!response.Success)
+            if (!response.Success && string.IsNullOrEmpty(lastKey))
             {
                 server.Logger.WriteError($"Could not get log server info of {logPath}/{b64Path} ({server.LogPath})");
                 return events;
             }
 
-            // parse each line
-            foreach (string eventLine in response.Data.Split(Environment.NewLine))
+            else if (!string.IsNullOrWhiteSpace(response.Data))
             {
-                if (eventLine.Length > 0)
+                // parse each line
+                foreach (string eventLine in response.Data
+                    .Split(Environment.NewLine)
+                    .Where(_line => _line.Length > 0))
                 {
                     try
                     {
-                        var e = Parser.GetEvent(server, eventLine);
+                        var gameEvent = Parser.GenerateGameEvent(eventLine);
+                        events.Add(gameEvent);
 #if DEBUG == true
-                        server.Logger.WriteDebug($"Parsed event with id {e.Id}  from http");
+                        server.Logger.WriteDebug($"Parsed event with id {gameEvent.Id}  from http");
 #endif
-                        events.Add(e);
                     }
 
                     catch (Exception e)
                     {
-                        server.Logger.WriteWarning("Could not properly parse event line");
+                        server.Logger.WriteError("Could not properly parse event line from http");
                         server.Logger.WriteDebug(e.Message);
                         server.Logger.WriteDebug(eventLine);
                     }

Application/IW4MServer.cs

@@ -6,9 +6,8 @@ using SharedLibraryCore.Configuration;
 using SharedLibraryCore.Database.Models;
 using SharedLibraryCore.Dtos;
 using SharedLibraryCore.Exceptions;
+using SharedLibraryCore.Helpers;
 using SharedLibraryCore.Interfaces;
-using SharedLibraryCore.Localization;
-using SharedLibraryCore.Objects;
 using SharedLibraryCore.Services;
 using System;
 using System.Collections.Generic;
@@ -24,9 +23,9 @@ namespace IW4MAdmin
 {
     public class IW4MServer : Server
     {
-        private static readonly Index loc = Utilities.CurrentLocalization.LocalizationIndex;
+        private static readonly SharedLibraryCore.Localization.Index loc = Utilities.CurrentLocalization.LocalizationIndex;
         private GameLogEventDetection LogEvent;
-        private DateTime SessionStart;
+        private const int REPORT_FLAG_COUNT = 4;
 
         public int Id { get; private set; }
 
@@ -34,79 +33,74 @@ namespace IW4MAdmin
         {
         }
 
-        override public async Task OnClientConnected(EFClient clientFromLog)
+        override public async Task<EFClient> OnClientConnected(EFClient clientFromLog)
         {
             Logger.WriteDebug($"Client slot #{clientFromLog.ClientNumber} now reserved");
 
-            try
+            EFClient client = await Manager.GetClientService().GetUnique(clientFromLog.NetworkId);
+
+            // first time client is connecting to server
+            if (client == null)
             {
-                EFClient client = await Manager.GetClientService().GetUnique(clientFromLog.NetworkId);
-
-                // first time client is connecting to server
-                if (client == null)
-                {
-                    Logger.WriteDebug($"Client {clientFromLog} first time connecting");
-                    clientFromLog.CurrentServer = this;
-                    client = await Manager.GetClientService().Create(clientFromLog);
-                }
-
-                /// this is only a temporary version until the IPAddress is transmitted
-                client.CurrentAlias = new EFAlias()
-                {
-                    Name = clientFromLog.Name,
-                    IPAddress = clientFromLog.IPAddress
-                };
-
-                Logger.WriteInfo($"Client {client} connected...");
-
-                // Do the player specific stuff
-                client.ClientNumber = clientFromLog.ClientNumber;
-                client.IsBot = clientFromLog.IsBot;
-                client.Score = clientFromLog.Score;
-                client.Ping = clientFromLog.Ping;
-                client.CurrentServer = this;
-
-                Clients[client.ClientNumber] = client;
-#if DEBUG == true
-                Logger.WriteDebug($"End PreConnect for {client}");
-#endif
-                var e = new GameEvent()
-                {
-                    Origin = client,
-                    Owner = this,
-                    Type = GameEvent.EventType.Connect
-                };
-
-                Manager.GetEventHandler().AddEvent(e);
-                await client.OnJoin(client.IPAddress);
-                client.State = ClientState.Connected;
+                Logger.WriteDebug($"Client {clientFromLog} first time connecting");
+                clientFromLog.CurrentServer = this;
+                client = await Manager.GetClientService().Create(clientFromLog);
             }
 
-            catch (Exception ex)
+            /// this is only a temporary version until the IPAddress is transmitted
+            client.CurrentAlias = new EFAlias()
             {
-                Logger.WriteError($"{loc["SERVER_ERROR_ADDPLAYER"]} {clientFromLog}");
-                Logger.WriteError(ex.GetExceptionInfo());
-            }
-        }
+                Name = clientFromLog.Name,
+                IPAddress = clientFromLog.IPAddress
+            };
 
-        override public async Task OnClientDisconnected(EFClient client)
-        {
+            Logger.WriteInfo($"Client {client} connected...");
+
+            // Do the player specific stuff
+            client.ClientNumber = clientFromLog.ClientNumber;
+            client.Score = clientFromLog.Score;
+            client.Ping = clientFromLog.Ping;
+            client.CurrentServer = this;
+
+            Clients[client.ClientNumber] = client;
 #if DEBUG == true
-            if (client.ClientNumber >= 0)
-            {
+            Logger.WriteDebug($"End PreConnect for {client}");
 #endif
-            Logger.WriteInfo($"Client {client} [{client.State.ToString().ToLower()}] disconnecting...");
-            Clients[client.ClientNumber] = null;
-            await client.OnDisconnect();
-
             var e = new GameEvent()
             {
                 Origin = client,
                 Owner = this,
-                Type = GameEvent.EventType.Disconnect
+                Type = GameEvent.EventType.Connect
             };
 
             Manager.GetEventHandler().AddEvent(e);
+            return client;
+        }
+
+        override public async Task OnClientDisconnected(EFClient client)
+        {
+            if (!GetClientsAsList().Any(_client => _client.NetworkId == client.NetworkId))
+            {
+                Logger.WriteInfo($"{client} disconnecting, but they are not connected");
+                return;
+            }
+
+#if DEBUG == true
+            if (client.ClientNumber >= 0)
+            {
+#endif
+                Logger.WriteInfo($"Client {client} [{client.State.ToString().ToLower()}] disconnecting...");
+                Clients[client.ClientNumber] = null;
+                await client.OnDisconnect();
+
+                var e = new GameEvent()
+                {
+                    Origin = client,
+                    Owner = this,
+                    Type = GameEvent.EventType.Disconnect
+                };
+
+                Manager.GetEventHandler().AddEvent(e);
 #if DEBUG == true
             }
 #endif
@@ -114,57 +108,89 @@ namespace IW4MAdmin
 
         public override async Task ExecuteEvent(GameEvent E)
         {
-            bool canExecuteCommand = true;
-
-            if (!await ProcessEvent(E))
+            if (E == null)
             {
+                Logger.WriteError("Received NULL event");
                 return;
             }
 
-            Command C = null;
-            if (E.Type == GameEvent.EventType.Command)
+            if (E.IsBlocking)
             {
-                try
+                await E.Origin?.Lock();
+            }
+
+            bool canExecuteCommand = true;
+            Exception lastException = null;
+
+            try
+            {
+                if (!await ProcessEvent(E))
                 {
-                    C = await SharedLibraryCore.Commands.CommandProcessing.ValidateCommand(E);
+                    return;
                 }
 
-                catch (CommandException e)
+                Command C = null;
+                if (E.Type == GameEvent.EventType.Command)
                 {
-                    Logger.WriteInfo(e.Message);
+                    try
+                    {
+                        C = await SharedLibraryCore.Commands.CommandProcessing.ValidateCommand(E);
+                    }
+
+                    catch (CommandException e)
+                    {
+                        Logger.WriteInfo(e.Message);
+                    }
+
+                    if (C != null)
+                    {
+                        E.Extra = C;
+                    }
                 }
 
-                if (C != null)
+                foreach (var plugin in SharedLibraryCore.Plugins.PluginImporter.ActivePlugins)
                 {
-                    E.Extra = C;
+                    try
+                    {
+                        await plugin.OnEventAsync(E, this);
+                    }
+                    catch (AuthorizationException e)
+                    {
+                        E.Origin.Tell($"{loc["COMMAND_NOTAUTHORIZED"]} - {e.Message}");
+                        canExecuteCommand = false;
+                    }
+                    catch (Exception Except)
+                    {
+                        Logger.WriteError($"{loc["SERVER_PLUGIN_ERROR"]} [{plugin.Name}]");
+                        Logger.WriteDebug(Except.GetExceptionInfo());
+                    }
+                }
+
+                // hack: this prevents commands from getting executing that 'shouldn't' be
+                if (E.Type == GameEvent.EventType.Command && E.Extra is Command command &&
+                    (canExecuteCommand || E.Origin?.Level == Permission.Console))
+                {
+                    await command.ExecuteAsync(E);
                 }
             }
 
-            foreach (var plugin in SharedLibraryCore.Plugins.PluginImporter.ActivePlugins)
+            catch (Exception e)
             {
-                try
-                {
-                    await plugin.OnEventAsync(E, this);
-                }
-                catch (AuthorizationException e)
-                {
-                    E.Origin.Tell($"{loc["COMMAND_NOTAUTHORIZED"]} - {e.Message}");
-                    canExecuteCommand = false;
-                }
-                catch (Exception Except)
-                {
-                    Logger.WriteError($"{loc["SERVER_PLUGIN_ERROR"]} [{plugin.Name}]");
-                    Logger.WriteDebug(Except.GetExceptionInfo());
-                }
+                lastException = e;
             }
 
-            // hack: this prevents commands from getting executing that 'shouldn't' be
-            if (E.Type == GameEvent.EventType.Command &&
-                E.Extra != null &&
-                (canExecuteCommand ||
-                E.Origin?.Level == EFClient.Permission.Console))
+            finally
             {
-                await (((Command)E.Extra).ExecuteAsync(E));
+                if (E.IsBlocking)
+                {
+                    E.Origin?.Unlock();
+                }
+
+                if (lastException != null)
+                {
+                    Logger.WriteDebug("Last Exception is not null");
+                    throw lastException;
+                }
             }
         }
 
@@ -175,6 +201,10 @@ namespace IW4MAdmin
         /// <returns></returns>
         override protected async Task<bool> ProcessEvent(GameEvent E)
         {
+#if DEBUG
+            Logger.WriteDebug($"processing event of type {E.Type}");
+#endif
+
             if (E.Type == GameEvent.EventType.ConnectionLost)
             {
                 var exception = E.Extra as Exception;
@@ -200,30 +230,29 @@ namespace IW4MAdmin
             if (E.Type == GameEvent.EventType.ChangePermission)
             {
                 var newPermission = (Permission)E.Extra;
-
-                if (newPermission < Permission.Moderator)
-                {
-                    // remove banned or demoted privileged user
-                    Manager.GetPrivilegedClients().Remove(E.Target.ClientId);
-                }
-
-                else
-                {
-                    if (Manager.GetPrivilegedClients().ContainsKey(E.Target.ClientId))
-                    {
-                        Manager.GetPrivilegedClients()[E.Target.ClientId] = E.Target;
-                    }
-
-                    else
-                    {
-                        Manager.GetPrivilegedClients().Add(E.Target.ClientId, E.Target);
-                    }
-                }
-
                 Logger.WriteInfo($"{E.Origin} is setting {E.Target} to permission level {newPermission}");
                 await Manager.GetClientService().UpdateLevel(newPermission, E.Target, E.Origin);
             }
 
+            else if (E.Type == GameEvent.EventType.Connect)
+            {
+                if (E.Origin.State != ClientState.Connected)
+                {
+                    E.Origin.State = ClientState.Connected;
+                    E.Origin.LastConnection = DateTime.UtcNow;
+                    E.Origin.Connections += 1;
+
+                    ChatHistory.Add(new ChatInfo()
+                    {
+                        Name = E.Origin.Name,
+                        Message = "CONNECTED",
+                        Time = DateTime.UtcNow
+                    });
+
+                    await E.Origin.OnJoin(E.Origin.IPAddress);
+                }
+            }
+
             else if (E.Type == GameEvent.EventType.PreConnect)
             {
                 // we don't want to track bots in the database at all if ignore bots is requested
@@ -235,13 +264,21 @@ namespace IW4MAdmin
                 var existingClient = GetClientsAsList().FirstOrDefault(_client => _client.Equals(E.Origin));
 
                 // they're already connected
-                if (existingClient != null)
+                if (existingClient != null && existingClient.ClientNumber == E.Origin.ClientNumber && !E.Origin.IsBot)
                 {
                     Logger.WriteWarning($"detected preconnect for {E.Origin}, but they are already connected");
                     return false;
                 }
 
-            CONNECT:
+                // this happens for some reason rarely where the client spots get out of order
+                // possible a connect/reconnect game event before we get to process it here 
+                else if (existingClient != null && existingClient.ClientNumber != E.Origin.ClientNumber)
+                {
+                    Logger.WriteWarning($"client {E.Origin} is trying to connect in client slot {E.Origin.ClientNumber}, but they are already registed in client slot {existingClient.ClientNumber}, swapping...");
+                    // we need to remove them so the client spots can swap
+                    await OnClientDisconnected(Clients[existingClient.ClientNumber]);
+                }
+
                 if (Clients[E.Origin.ClientNumber] == null)
                 {
 #if DEBUG == true
@@ -249,14 +286,20 @@ namespace IW4MAdmin
 #endif
                     // we can go ahead and put them in so that they don't get re added
                     Clients[E.Origin.ClientNumber] = E.Origin;
-                    await OnClientConnected(E.Origin);
-
-                    ChatHistory.Add(new ChatInfo()
+                    try
                     {
-                        Name = E.Origin.Name,
-                        Message = "CONNECTED",
-                        Time = DateTime.UtcNow
-                    });
+                        E.Origin = await OnClientConnected(E.Origin);
+                        E.Target = E.Origin;
+                    }
+
+                    catch (Exception ex)
+                    {
+                        Logger.WriteError($"{loc["SERVER_ERROR_ADDPLAYER"]} {E.Origin}");
+                        Logger.WriteDebug(ex.GetExceptionInfo());
+
+                        Clients[E.Origin.ClientNumber] = null;
+                        return false;
+                    }
 
                     if (E.Origin.Level > EFClient.Permission.Moderator)
                     {
@@ -267,19 +310,24 @@ namespace IW4MAdmin
                 // for some reason there's still a client in the spot
                 else
                 {
-                    Logger.WriteWarning($"{E.Origin} is connecteding but {Clients[E.Origin.ClientNumber]} is currently in that client slot");
-                    await OnClientDisconnected(Clients[E.Origin.ClientNumber]);
-                    goto CONNECT;
+                    Logger.WriteWarning($"{E.Origin} is connecting but {Clients[E.Origin.ClientNumber]} is currently in that client slot");
                 }
             }
 
             else if (E.Type == GameEvent.EventType.Flag)
             {
-                // todo: maybe move this to a seperate function
-                Penalty newPenalty = new Penalty()
+                DateTime? expires = null;
+
+                if (E.Extra is TimeSpan ts)
                 {
-                    Type = Penalty.PenaltyType.Flag,
-                    Expires = DateTime.UtcNow,
+                    expires = DateTime.UtcNow + ts;
+                }
+
+                // todo: maybe move this to a seperate function
+                var newPenalty = new EFPenalty()
+                {
+                    Type = EFPenalty.PenaltyType.Flag,
+                    Expires = expires,
                     Offender = E.Target,
                     Offense = E.Data,
                     Punisher = E.Origin,
@@ -293,9 +341,9 @@ namespace IW4MAdmin
 
             else if (E.Type == GameEvent.EventType.Unflag)
             {
-                var unflagPenalty = new Penalty()
+                var unflagPenalty = new EFPenalty()
                 {
-                    Type = Penalty.PenaltyType.Unflag,
+                    Type = EFPenalty.PenaltyType.Unflag,
                     Expires = DateTime.UtcNow,
                     Offender = E.Target,
                     Offense = E.Data,
@@ -304,8 +352,9 @@ namespace IW4MAdmin
                     Link = E.Target.AliasLink
                 };
 
-                await Manager.GetPenaltyService().Create(unflagPenalty);
                 E.Target.SetLevel(Permission.User, E.Origin);
+                await Manager.GetPenaltyService().RemoveActivePenalties(E.Target.AliasLinkId);
+                await Manager.GetPenaltyService().Create(unflagPenalty);
             }
 
             else if (E.Type == GameEvent.EventType.Report)
@@ -316,6 +365,28 @@ namespace IW4MAdmin
                     Target = E.Target,
                     Reason = E.Data
                 });
+
+                var newReport = new EFPenalty()
+                {
+                    Type = EFPenalty.PenaltyType.Report,
+                    Expires = DateTime.UtcNow,
+                    Offender = E.Target,
+                    Offense = E.Message,
+                    Punisher = E.Origin,
+                    Active = true,
+                    When = DateTime.UtcNow,
+                    Link = E.Target.AliasLink
+                };
+
+                await Manager.GetPenaltyService().Create(newReport);
+
+                int reportNum = await Manager.GetClientService().GetClientReportCount(E.Target.ClientId);
+                bool isAutoFlagged = await Manager.GetClientService().IsAutoFlagged(E.Target.ClientId);
+
+                if (!E.Target.IsPrivileged() && reportNum >= REPORT_FLAG_COUNT && !isAutoFlagged)
+                {
+                    E.Target.Flag(Utilities.CurrentLocalization.LocalizationIndex["SERVER_AUTO_FLAG_REPORT"].FormatExt(reportNum), Utilities.IW4MAdminClient(E.Owner));
+                }
             }
 
             else if (E.Type == GameEvent.EventType.TempBan)
@@ -363,7 +434,13 @@ namespace IW4MAdmin
                 // so we need to disconnect the "full" version of the client
                 var client = GetClientsAsList().FirstOrDefault(_client => _client.Equals(E.Origin));
 
-                if (client != null)
+                if (client == null)
+                {
+                    Logger.WriteWarning($"Client {E.Origin} detected as disconnecting, but could not find them in the player list");
+                    return false;
+                }
+
+                else if (client.State == ClientState.Connected)
                 {
 #if DEBUG == true
                     Logger.WriteDebug($"Begin PreDisconnect for {client}");
@@ -372,12 +449,12 @@ namespace IW4MAdmin
 #if DEBUG == true
                     Logger.WriteDebug($"End PreDisconnect for {client}");
 #endif
+                    return true;
                 }
 
-                else if (client?.State != ClientState.Disconnecting)
+                else
                 {
-                    Logger.WriteWarning($"Client {E.Origin} detected as disconnecting, but could not find them in the player list");
-                    Logger.WriteDebug($"Expected {E.Origin} but found {GetClientsAsList().FirstOrDefault(_client => _client.ClientNumber == E.Origin.ClientNumber)}");
+                    Logger.WriteWarning($"Expected disconnecting client {client} to be in state {ClientState.Connected.ToString()}, but is in state {client.State}");
                     return false;
                 }
             }
@@ -392,8 +469,6 @@ namespace IW4MAdmin
 
             if (E.Type == GameEvent.EventType.Say)
             {
-                E.Data = E.Data.StripColors();
-
                 if (E.Data?.Length > 0)
                 {
                     string message = E.Data;
@@ -425,7 +500,7 @@ namespace IW4MAdmin
                 // iw4 doesn't log the game info
                 if (E.Extra == null)
                 {
-                    var dict = await this.GetInfoAsync();
+                    var dict = await this.GetInfoAsync(new TimeSpan(0, 0, 20));
 
                     if (dict == null)
                     {
@@ -434,34 +509,29 @@ namespace IW4MAdmin
 
                     else
                     {
-                        Gametype = dict["gametype"].StripColors();
-                        Hostname = dict["hostname"]?.StripColors();
+                        Gametype = dict["gametype"];
+                        Hostname = dict["hostname"];
 
-                        string mapname = dict["mapname"]?.StripColors() ?? CurrentMap.Name;
-                        CurrentMap = Maps.Find(m => m.Name == mapname) ?? new Map() { Alias = mapname, Name = mapname };
+                        string mapname = dict["mapname"] ?? CurrentMap.Name;
+                        UpdateMap(mapname);
                     }
                 }
 
                 else
                 {
                     var dict = (Dictionary<string, string>)E.Extra;
-                    Gametype = dict["g_gametype"].StripColors();
-                    Hostname = dict["sv_hostname"].StripColors();
+                    Gametype = dict["g_gametype"];
+                    Hostname = dict["sv_hostname"];
                     MaxClients = int.Parse(dict["sv_maxclients"]);
 
-                    string mapname = dict["mapname"].StripColors();
-                    CurrentMap = Maps.Find(m => m.Name == mapname) ?? new Map()
-                    {
-                        Alias = mapname,
-                        Name = mapname
-                    };
+                    string mapname = dict["mapname"];
+                    UpdateMap(mapname);
                 }
             }
 
             if (E.Type == GameEvent.EventType.MapEnd)
             {
                 Logger.WriteInfo("Game ending...");
-                SessionStart = DateTime.UtcNow;
             }
 
             if (E.Type == GameEvent.EventType.Tell)
@@ -502,34 +572,38 @@ namespace IW4MAdmin
         {
             var client = GetClientsAsList().FirstOrDefault(_client => _client.Equals(origin));
 
-            if (client != null)
+            if (client == null)
             {
-                client.Ping = origin.Ping;
-                client.Score = origin.Score;
+                Logger.WriteWarning($"{origin} expected to exist in client list for update, but they do not");
+                return;
+            }
 
-                // update their IP if it hasn't been set yet
-                if (client.IPAddress == null &&
-                    !client.IsBot &&
-                    client.State == ClientState.Connected)
+            client.Ping = origin.Ping;
+            client.Score = origin.Score;
+
+            // update their IP if it hasn't been set yet
+            if (client.IPAddress == null &&
+                !client.IsBot &&
+                client.State == ClientState.Connected)
+            {
+                try
                 {
-                    try
-                    {
-                        await client.OnJoin(origin.IPAddress);
-                    }
+                    await client.OnJoin(origin.IPAddress);
+                }
 
-                    catch (Exception e)
-                    {
-                        origin.CurrentServer.Logger.WriteWarning($"Could not execute on join for {origin}");
-                        origin.CurrentServer.Logger.WriteDebug(e.GetExceptionInfo());
-                    }
+                catch (Exception e)
+                {
+                    Logger.WriteWarning($"Could not execute on join for {origin}");
+                    Logger.WriteDebug(e.GetExceptionInfo());
                 }
             }
         }
 
         /// <summary>
         /// lists the connecting and disconnecting clients via RCon response
-        /// array index 0 =  connecting clients
+        /// array index 0 = connecting clients
         /// array index 1 = disconnecting clients
+        /// array index 2 = updated clients
         /// </summary>
         /// <returns></returns>
         async Task<IList<EFClient>[]> PollPlayersAsync()
@@ -538,7 +612,8 @@ namespace IW4MAdmin
             var now = DateTime.Now;
 #endif
             var currentClients = GetClientsAsList();
-            var polledClients = (await this.GetStatusAsync()).AsEnumerable();
+            var statusResponse = (await this.GetStatusAsync());
+            var polledClients = statusResponse.Item1.AsEnumerable();
 
             if (Manager.GetApplicationSettings().Configuration().IgnoreBots)
             {
@@ -551,6 +626,8 @@ namespace IW4MAdmin
             var connectingClients = polledClients.Except(currentClients);
             var updatedClients = polledClients.Except(connectingClients).Except(disconnectingClients);
 
+            UpdateMap(statusResponse.Item2);
+
             return new List<EFClient>[]
             {
                 connectingClients.ToList(),
@@ -559,6 +636,42 @@ namespace IW4MAdmin
             };
         }
 
+        private void UpdateMap(string mapname)
+        {
+            if (!string.IsNullOrEmpty(mapname))
+            {
+                CurrentMap = Maps.Find(m => m.Name == mapname) ?? new Map()
+                {
+                    Alias = mapname,
+                    Name = mapname
+                };
+            }
+        }
+
+        private async Task ShutdownInternal()
+        {
+            foreach (var client in GetClientsAsList())
+            {
+                await client.OnDisconnect();
+
+                var e = new GameEvent()
+                {
+                    Type = GameEvent.EventType.Disconnect,
+                    Owner = this,
+                    Origin = client
+                };
+
+                Manager.GetEventHandler().AddEvent(e);
+
+                await e.WaitAsync(Utilities.DefaultCommandTimeout, new CancellationTokenRegistration().Token);
+            }
+
+            foreach (var plugin in SharedLibraryCore.Plugins.PluginImporter.ActivePlugins)
+            {
+                await plugin.OnUnloadAsync();
+            }
+        }
+
         DateTime start = DateTime.Now;
         DateTime playerCountStart = DateTime.Now;
         DateTime lastCount = DateTime.Now;
@@ -567,35 +680,22 @@ namespace IW4MAdmin
         {
             try
             {
-                #region SHUTDOWN
-                if (Manager.ShutdownRequested())
+                if (cts.IsCancellationRequested)
                 {
-                    foreach (var client in GetClientsAsList())
-                    {
-                        var e = new GameEvent()
-                        {
-                            Type = GameEvent.EventType.PreDisconnect,
-                            Origin = client,
-                            Owner = this,
-                        };
-
-                        Manager.GetEventHandler().AddEvent(e);
-                        await e.WaitAsync();
-                    }
-
-                    foreach (var plugin in SharedLibraryCore.Plugins.PluginImporter.ActivePlugins)
-                    {
-                        await plugin.OnUnloadAsync();
-                    }
-
+                    await ShutdownInternal();
                     return true;
                 }
-                #endregion
 
                 try
                 {
+#if DEBUG
+                    if (Manager.GetApplicationSettings().Configuration().RConPollRate == int.MaxValue)
+                    {
+                        return true;
+                    }
+#endif
+
                     var polledClients = await PollPlayersAsync();
-                    var waiterList = new List<GameEvent>();
 
                     foreach (var disconnectingClient in polledClients[1])
                     {
@@ -612,19 +712,14 @@ namespace IW4MAdmin
                         };
 
                         Manager.GetEventHandler().AddEvent(e);
-                        // wait until the disconnect event is complete
-                        // because we don't want to try to fill up a slot that's not empty yet
-                        waiterList.Add(e);
+                        await e.WaitAsync(Utilities.DefaultCommandTimeout, Manager.CancellationToken);
                     }
-                    // wait for all the disconnect tasks to finish
-                    await Task.WhenAll(waiterList.Select(e => e.WaitAsync(10 * 1000)));
 
-                    waiterList.Clear();
                     // this are our new connecting clients
                     foreach (var client in polledClients[0])
                     {
                         // note: this prevents players in ZMBI state from being registered with no name
-                        if (string.IsNullOrEmpty(client.Name))
+                        if (string.IsNullOrEmpty(client.Name) || (client.Ping == 999 && !client.IsBot))
                         {
                             continue;
                         }
@@ -633,17 +728,14 @@ namespace IW4MAdmin
                         {
                             Type = GameEvent.EventType.PreConnect,
                             Origin = client,
-                            Owner = this
+                            Owner = this,
+                            IsBlocking = true
                         };
 
                         Manager.GetEventHandler().AddEvent(e);
-                        waiterList.Add(e);
+                        await e.WaitAsync(Utilities.DefaultCommandTimeout, Manager.CancellationToken);
                     }
 
-                    // wait for all the connect tasks to finish
-                    await Task.WhenAll(waiterList.Select(e => e.WaitAsync(10 * 1000)));
-
-                    waiterList.Clear();
                     // these are the clients that have updated
                     foreach (var client in polledClients[2])
                     {
@@ -655,11 +747,8 @@ namespace IW4MAdmin
                         };
 
                         Manager.GetEventHandler().AddEvent(e);
-                        waiterList.Add(e);
                     }
 
-                    await Task.WhenAll(waiterList.Select(e => e.WaitAsync(10 * 1000)));
-
                     if (ConnectionErrors > 0)
                     {
                         var _event = new GameEvent()
@@ -701,14 +790,14 @@ namespace IW4MAdmin
                 lastCount = DateTime.Now;
 
                 // update the player history 
-                if ((lastCount - playerCountStart).TotalMinutes >= SharedLibraryCore.Helpers.PlayerHistory.UpdateInterval)
+                if ((lastCount - playerCountStart).TotalMinutes >= PlayerHistory.UpdateInterval)
                 {
-                    while (ClientHistory.Count > ((60 / SharedLibraryCore.Helpers.PlayerHistory.UpdateInterval) * 12)) // 12 times a hour for 12 hours
+                    while (ClientHistory.Count > ((60 / PlayerHistory.UpdateInterval) * 12)) // 12 times a hour for 12 hours
                     {
                         ClientHistory.Dequeue();
                     }
 
-                    ClientHistory.Enqueue(new SharedLibraryCore.Helpers.PlayerHistory(ClientNum));
+                    ClientHistory.Enqueue(new PlayerHistory(ClientNum));
                     playerCountStart = DateTime.Now;
                 }
 
@@ -731,6 +820,12 @@ namespace IW4MAdmin
                 return true;
             }
 
+            catch (TaskCanceledException)
+            {
+                await ShutdownInternal();
+                return true;
+            }
+
             // this one is ok
             catch (ServerException e)
             {
@@ -740,6 +835,7 @@ namespace IW4MAdmin
                     Logger.WriteDebug(e.GetExceptionInfo());
                 }
 
+                Logger.WriteError(e.Message);
                 return false;
             }
 
@@ -775,11 +871,19 @@ namespace IW4MAdmin
 
             if (version?.Value?.Length != 0)
             {
-                RconParser = Manager.AdditionalRConParsers.FirstOrDefault(_parser => _parser.Version == version.Value) ?? RconParser;
+                var matchedRconParser = Manager.AdditionalRConParsers.FirstOrDefault(_parser => _parser.Version == version.Value);
+                RconParser.Configuration = matchedRconParser != null ? matchedRconParser.Configuration : RconParser.Configuration;
                 EventParser = Manager.AdditionalEventParsers.FirstOrDefault(_parser => _parser.Version == version.Value) ?? EventParser;
                 Version = RconParser.Version;
             }
 
+            var svRunning = await this.GetDvarAsync<int>("sv_running");
+
+            if (svRunning.Value == 0)
+            {
+                throw new ServerException(loc["SERVER_ERROR_NOT_RUNNING"]);
+            }
+
             var infoResponse = RconParser.Configuration.CommandPrefixes.RConGetInfo != null ? await this.GetInfoAsync() : null;
             // this is normally slow, but I'm only doing it because different games have different prefixes
             var hostname = infoResponse == null ?
@@ -819,22 +923,38 @@ namespace IW4MAdmin
 
             InitializeMaps();
 
-            this.Hostname = hostname.StripColors();
-            this.CurrentMap = Maps.Find(m => m.Name == mapname) ?? new Map() { Alias = mapname, Name = mapname };
+            this.Hostname = hostname;
             this.MaxClients = maxplayers;
             this.FSGame = game;
             this.Gametype = gametype;
             this.IP = ip.Value == "localhost" ? ServerConfig.IPAddress : ip.Value ?? ServerConfig.IPAddress;
+            UpdateMap(mapname);
 
-            if ((logsync.Value == 0 || logfile.Value == string.Empty) && RconParser.CanGenerateLogPath)
+            if (RconParser.CanGenerateLogPath)
             {
+                bool needsRestart = false;
+
+                if (logsync.Value == 0)
+                {
+                    await this.SetDvarAsync("g_logsync", 2); // set to 2 for continous in other games, clamps to 1 for IW4
+                    needsRestart = true;
+                }
+
+                if (string.IsNullOrWhiteSpace(logfile.Value))
+                {
+                    logfile.Value = "games_mp.log";
+                    await this.SetDvarAsync("g_log", logfile.Value);
+                    needsRestart = true;
+                }
+
+                if (needsRestart)
+                {
+                    Logger.WriteWarning("Game log file not properly initialized, restarting map...");
+                    await this.ExecuteCommandAsync("map_restart");
+                }
+
                 // this DVAR isn't set until the a map is loaded
                 await this.SetDvarAsync("logfile", 2);
-                await this.SetDvarAsync("g_logsync", 2); // set to 2 for continous in other games, clamps to 1 for IW4
-                //await this.SetDvarAsync("g_log", "games_mp.log");
-                Logger.WriteWarning("Game log file not properly initialized, restarting map...");
-                await this.ExecuteCommandAsync("map_restart");
-                logfile = await this.GetDvarAsync<string>("g_log");
             }
 
             CustomCallback = await ScriptLoaded();
@@ -902,9 +1022,9 @@ namespace IW4MAdmin
                 Target.CurrentServer.Broadcast(message);
             }
 
-            Penalty newPenalty = new Penalty()
+            var newPenalty = new EFPenalty()
             {
-                Type = Penalty.PenaltyType.Warning,
+                Type = EFPenalty.PenaltyType.Warning,
                 Expires = DateTime.UtcNow,
                 Offender = Target,
                 Punisher = Origin,
@@ -938,12 +1058,20 @@ namespace IW4MAdmin
 #endif
 
 #if DEBUG
-            await Target.CurrentServer.OnClientDisconnected(Target);
+            // await Target.CurrentServer.OnClientDisconnected(Target);
+            var e = new GameEvent()
+            {
+                Type = GameEvent.EventType.PreDisconnect,
+                Origin = Target,
+                Owner = this
+            };
+
+            Manager.GetEventHandler().AddEvent(e);
 #endif
 
-            var newPenalty = new Penalty()
+            var newPenalty = new EFPenalty()
             {
-                Type = Penalty.PenaltyType.Kick,
+                Type = EFPenalty.PenaltyType.Kick,
                 Expires = DateTime.UtcNow,
                 Offender = Target,
                 Offense = Reason,
@@ -978,9 +1106,9 @@ namespace IW4MAdmin
             await Target.CurrentServer.OnClientDisconnected(Target);
 #endif
 
-            Penalty newPenalty = new Penalty()
+            var newPenalty = new EFPenalty()
             {
-                Type = Penalty.PenaltyType.TempBan,
+                Type = EFPenalty.PenaltyType.TempBan,
                 Expires = DateTime.UtcNow + length,
                 Offender = Target,
                 Offense = Reason,
@@ -1012,26 +1140,23 @@ namespace IW4MAdmin
 
             else
             {
-
 #if !DEBUG
-                string formattedString = String.Format(RconParser.Configuration.CommandPrefixes.Kick, targetClient.ClientNumber, $"{loc["SERVER_BAN_TEXT"]} - ^5{reason} ^7{loc["SERVER_BAN_APPEAL"].FormatExt(Website)}^7");
+                string formattedString = string.Format(RconParser.Configuration.CommandPrefixes.Kick, targetClient.ClientNumber, $"{loc["SERVER_BAN_TEXT"]} - ^5{reason} ^7{loc["SERVER_BAN_APPEAL"].FormatExt(Website)}^7");
                 await targetClient.CurrentServer.ExecuteCommandAsync(formattedString);
 #else
                 await targetClient.CurrentServer.OnClientDisconnected(targetClient);
 #endif
             }
 
-            Penalty newPenalty = new Penalty()
+            EFPenalty newPenalty = new EFPenalty()
             {
-                Type = Penalty.PenaltyType.Ban,
+                Type = EFPenalty.PenaltyType.Ban,
                 Expires = null,
                 Offender = targetClient,
                 Offense = reason,
                 Punisher = originClient,
                 Link = targetClient.AliasLink,
-                AutomatedOffense = originClient.AdministeredPenalties?.FirstOrDefault()?.AutomatedOffense,
                 IsEvadedOffense = isEvade
-
             };
 
             targetClient.SetLevel(Permission.Banned, originClient);
@@ -1040,10 +1165,10 @@ namespace IW4MAdmin
 
         override public async Task Unban(string reason, EFClient Target, EFClient Origin)
         {
-            var unbanPenalty = new Penalty()
+            var unbanPenalty = new EFPenalty()
             {
-                Type = Penalty.PenaltyType.Unban,
-                Expires = null,
+                Type = EFPenalty.PenaltyType.Unban,
+                Expires = DateTime.Now,
                 Offender = Target,
                 Offense = reason,
                 Punisher = Origin,
@@ -1052,17 +1177,17 @@ namespace IW4MAdmin
                 Link = Target.AliasLink
             };
 
-            await Manager.GetPenaltyService().RemoveActivePenalties(Target.AliasLink.AliasLinkId, Origin);
-            await Manager.GetPenaltyService().Create(unbanPenalty);
             Target.SetLevel(Permission.User, Origin);
+            await Manager.GetPenaltyService().RemoveActivePenalties(Target.AliasLink.AliasLinkId);
+            await Manager.GetPenaltyService().Create(unbanPenalty);
         }
 
         override public void InitializeTokens()
         {
-            Manager.GetMessageTokens().Add(new SharedLibraryCore.Helpers.MessageToken("TOTALPLAYERS", (Server s) => Task.Run(async () => (await Manager.GetClientService().GetTotalClientsAsync()).ToString())));
-            Manager.GetMessageTokens().Add(new SharedLibraryCore.Helpers.MessageToken("VERSION", (Server s) => Task.FromResult(Application.Program.Version.ToString())));
-            Manager.GetMessageTokens().Add(new SharedLibraryCore.Helpers.MessageToken("NEXTMAP", (Server s) => SharedLibraryCore.Commands.CNextMap.GetNextMap(s)));
-            Manager.GetMessageTokens().Add(new SharedLibraryCore.Helpers.MessageToken("ADMINS", (Server s) => Task.FromResult(SharedLibraryCore.Commands.CListAdmins.OnlineAdmins(s))));
+            Manager.GetMessageTokens().Add(new MessageToken("TOTALPLAYERS", (Server s) => Task.Run(async () => (await Manager.GetClientService().GetTotalClientsAsync()).ToString())));
+            Manager.GetMessageTokens().Add(new MessageToken("VERSION", (Server s) => Task.FromResult(Application.Program.Version.ToString())));
+            Manager.GetMessageTokens().Add(new MessageToken("NEXTMAP", (Server s) => SharedLibraryCore.Commands.CNextMap.GetNextMap(s)));
+            Manager.GetMessageTokens().Add(new MessageToken("ADMINS", (Server s) => Task.FromResult(SharedLibraryCore.Commands.CListAdmins.OnlineAdmins(s))));
         }
     }
 }

Application/Main.cs

@@ -1,8 +1,9 @@
 using IW4MAdmin.Application.Migration;
+using Microsoft.Extensions.DependencyInjection;
 using SharedLibraryCore;
-using SharedLibraryCore.Localization;
+using SharedLibraryCore.Helpers;
+using SharedLibraryCore.Interfaces;
 using System;
-using System.IO;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
@@ -11,195 +12,235 @@ namespace IW4MAdmin.Application
 {
     public class Program
     {
-        static public double Version { get; private set; }
-        static public ApplicationManager ServerManager;
-        private static ManualResetEventSlim OnShutdownComplete = new ManualResetEventSlim();
+        public static BuildNumber Version { get; private set; } = BuildNumber.Parse(Utilities.GetVersionAsString());
+        public static ApplicationManager ServerManager;
+        private static Task ApplicationTask;
+        private static readonly BuildNumber _fallbackVersion = BuildNumber.Parse("99.99.99.99");
 
-        public static void Main(string[] args)
+        /// <summary>
+        /// entrypoint of the application
+        /// </summary>
+        /// <returns></returns>
+        public static async Task Main()
         {
             AppDomain.CurrentDomain.SetData("DataDirectory", Utilities.OperatingDirectory);
+
             Console.OutputEncoding = Encoding.UTF8;
             Console.ForegroundColor = ConsoleColor.Gray;
 
-            Version = Utilities.GetVersionAsDouble();
+            Console.CancelKeyPress += new ConsoleCancelEventHandler(OnCancelKey);
 
             Console.WriteLine("=====================================================");
-            Console.WriteLine(" IW4M ADMIN");
+            Console.WriteLine(" IW4MAdmin");
             Console.WriteLine(" by RaidMax ");
             Console.WriteLine($" Version {Utilities.GetVersionAsString()}");
             Console.WriteLine("=====================================================");
 
-            Index loc = null;
+            await LaunchAsync();
+        }
 
+        /// <summary>
+        /// event callback executed when the control + c combination is detected
+        /// gracefully stops the server manager and waits for all tasks to finish
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private static async void OnCancelKey(object sender, ConsoleCancelEventArgs e)
+        {
+            ServerManager?.Stop();
+            await ApplicationTask;
+        }
+
+        /// <summary>
+        /// task that initializes application and starts the application monitoring and runtime tasks
+        /// </summary>
+        /// <returns></returns>
+        private static async Task LaunchAsync()
+        {
+        restart:
             try
             {
                 ServerManager = ApplicationManager.GetInstance();
                 var configuration = ServerManager.GetApplicationSettings().Configuration();
+                Localization.Configure.Initialize(configuration?.EnableCustomLocale ?? false ? (configuration.CustomLocale ?? "en-US") : "en-US");
 
-                if (configuration != null)
-                {
-                    Localization.Configure.Initialize(configuration.EnableCustomLocale ? (configuration.CustomLocale ?? "windows-1252") : "windows-1252");
-                }
-
-                else
-                {
-                    Localization.Configure.Initialize();
-                }
-
-                loc = Utilities.CurrentLocalization.LocalizationIndex;
-                Console.CancelKeyPress += new ConsoleCancelEventHandler(OnCancelKey);
-
-                CheckDirectories();
-                // do any needed migrations
-                // todo: move out
+                // do any needed housekeeping file/folder migrations
                 ConfigurationMigration.MoveConfigFolder10518(null);
+                ConfigurationMigration.CheckDirectories();
 
-                ServerManager.Logger.WriteInfo($"Version is {Version}");
+                ServerManager.Logger.WriteInfo(Utilities.CurrentLocalization.LocalizationIndex["MANAGER_VERSION"].FormatExt(Version));
 
-                var api = API.Master.Endpoint.Get();
-
-                var version = new API.Master.VersionInfo()
-                {
-                    CurrentVersionStable = 99.99f
-                };
-
-                try
-                {
-                    version = api.GetVersion().Result;
-                }
-
-                catch (Exception e)
-                {
-                    ServerManager.Logger.WriteWarning(loc["MANAGER_VERSION_FAIL"]);
-                    while (e.InnerException != null)
-                    {
-                        e = e.InnerException;
-                    }
-
-                    ServerManager.Logger.WriteDebug(e.Message);
-                }
-
-                if (version.CurrentVersionStable == 99.99f)
-                {
-                    Console.ForegroundColor = ConsoleColor.Red;
-                    Console.WriteLine(loc["MANAGER_VERSION_FAIL"]);
-                    Console.ForegroundColor = ConsoleColor.Gray;
-                }
-
-#if !PRERELEASE
-                else if (version.CurrentVersionStable > Version)
-                {
-                    Console.ForegroundColor = ConsoleColor.DarkYellow;
-                    Console.WriteLine($"IW4MAdmin {loc["MANAGER_VERSION_UPDATE"]} [v{version.CurrentVersionStable.ToString("0.0")}]");
-                        Console.WriteLine(loc["MANAGER_VERSION_CURRENT"].FormatExt($"[v{Version.ToString("0.0")}]"));
-                    Console.ForegroundColor = ConsoleColor.Gray;
-                }
-#else
-                else if (version.CurrentVersionPrerelease > Version)
-                {
-                    Console.ForegroundColor = ConsoleColor.DarkYellow;
-                    Console.WriteLine($"IW4MAdmin-Prerelease {loc["MANAGER_VERSION_UPDATE"]} [v{version.CurrentVersionPrerelease.ToString("0.0")}-pr]");
-                    Console.WriteLine(loc["MANAGER_VERSION_CURRENT"].FormatExt($"[v{Version.ToString("0.0")}-pr]"));
-                    Console.ForegroundColor = ConsoleColor.Gray;
-                }
-#endif 
-                else
-                {
-                    Console.ForegroundColor = ConsoleColor.Green;
-                    Console.WriteLine(loc["MANAGER_VERSION_SUCCESS"]);
-                    Console.ForegroundColor = ConsoleColor.Gray;
-                }
-
-                ServerManager.Init().Wait();
-
-                var consoleTask = Task.Run(async () =>
-                {
-                    string userInput;
-                    var Origin = Utilities.IW4MAdminClient(ServerManager.Servers[0]);
-
-                    do
-                    {
-                        userInput = Console.ReadLine();
-
-                        if (userInput?.ToLower() == "quit")
-                        {
-                            ServerManager.Stop();
-                        }
-
-                        if (ServerManager.Servers.Count == 0)
-                        {
-                            Console.WriteLine(loc["MANAGER_CONSOLE_NOSERV"]);
-                            continue;
-                        }
-
-                        if (userInput?.Length > 0)
-                        {
-                            GameEvent E = new GameEvent()
-                            {
-                                Type = GameEvent.EventType.Command,
-                                Data = userInput,
-                                Origin = Origin,
-                                Owner = ServerManager.Servers[0]
-                            };
-
-                            ServerManager.GetEventHandler().AddEvent(E);
-                            await E.WaitAsync(30 * 1000);
-                        }
-                        Console.Write('>');
-
-                    } while (ServerManager.Running);
-                });
+                ConfigureServices();
+                await CheckVersion();
+                await ServerManager.Init();
             }
 
             catch (Exception e)
             {
+                var loc = Utilities.CurrentLocalization.LocalizationIndex;
                 string failMessage = loc == null ? "Failed to initalize IW4MAdmin" : loc["MANAGER_INIT_FAIL"];
                 string exitMessage = loc == null ? "Press any key to exit..." : loc["MANAGER_EXIT"];
 
                 Console.WriteLine(failMessage);
+
                 while (e.InnerException != null)
                 {
                     e = e.InnerException;
                 }
+
                 Console.WriteLine(e.Message);
                 Console.WriteLine(exitMessage);
                 Console.ReadKey();
                 return;
             }
 
-            if (ServerManager.GetApplicationSettings().Configuration().EnableWebFront)
+            try
             {
-                Task.Run(() => WebfrontCore.Program.Init(ServerManager));
+                ApplicationTask = RunApplicationTasksAsync();
+                await ApplicationTask;
             }
 
-            OnShutdownComplete.Reset();
-            ServerManager.Start();
-            ServerManager.Logger.WriteVerbose(loc["MANAGER_SHUTDOWN_SUCCESS"]);
-            OnShutdownComplete.Set();
+            catch { }
+
+            if (ServerManager.IsRestartRequested)
+            {
+                goto restart;
+            }
         }
 
-        private static void OnCancelKey(object sender, ConsoleCancelEventArgs e)
+        /// <summary>
+        /// runs the core application tasks
+        /// </summary>
+        /// <returns></returns>
+        private static async Task RunApplicationTasksAsync()
         {
-            ServerManager.Stop();
-            OnShutdownComplete.Wait();
+            var webfrontTask = ServerManager.GetApplicationSettings().Configuration().EnableWebFront ?
+                WebfrontCore.Program.Init(ServerManager, ServerManager.CancellationToken) :
+                Task.CompletedTask;
+
+            // we want to run this one on a manual thread instead of letting the thread pool handle it,
+            // because we can't exit early from waiting on console input, and it prevents us from restarting
+            var inputThread = new Thread(async () => await ReadConsoleInput());
+            inputThread.Start();
+
+            var tasks = new[]
+            {
+                ServerManager.Start(),
+                webfrontTask,
+            };
+
+            await Task.WhenAll(tasks);
+
+            ServerManager.Logger.WriteVerbose(Utilities.CurrentLocalization.LocalizationIndex["MANAGER_SHUTDOWN_SUCCESS"]);
         }
 
-        static void CheckDirectories()
+        /// <summary>
+        /// checks for latest version of the application
+        /// notifies user if an update is available
+        /// </summary>
+        /// <returns></returns>
+        private static async Task CheckVersion()
         {
-            if (!Directory.Exists(Path.Join(Utilities.OperatingDirectory, "Plugins")))
+            var api = API.Master.Endpoint.Get();
+            var loc = Utilities.CurrentLocalization.LocalizationIndex;
+
+            var version = new API.Master.VersionInfo()
             {
-                Directory.CreateDirectory(Path.Join(Utilities.OperatingDirectory, "Plugins"));
+                CurrentVersionStable = _fallbackVersion
+            };
+
+            try
+            {
+                version = await api.GetVersion(1);
             }
 
-            if (!Directory.Exists(Path.Join(Utilities.OperatingDirectory, "Database")))
+            catch (Exception e)
             {
-                Directory.CreateDirectory(Path.Join(Utilities.OperatingDirectory, "Database"));
+                ServerManager.Logger.WriteWarning(loc["MANAGER_VERSION_FAIL"]);
+                while (e.InnerException != null)
+                {
+                    e = e.InnerException;
+                }
+
+                ServerManager.Logger.WriteDebug(e.Message);
             }
 
-            if (!Directory.Exists(Path.Join(Utilities.OperatingDirectory, "Log")))
+            if (version.CurrentVersionStable == _fallbackVersion)
             {
-                Directory.CreateDirectory(Path.Join(Utilities.OperatingDirectory, "Log"));
+                Console.ForegroundColor = ConsoleColor.Red;
+                Console.WriteLine(loc["MANAGER_VERSION_FAIL"]);
+                Console.ForegroundColor = ConsoleColor.Gray;
             }
+
+#if !PRERELEASE
+            else if (version.CurrentVersionStable > Version)
+            {
+                Console.ForegroundColor = ConsoleColor.DarkYellow;
+                Console.WriteLine($"IW4MAdmin {loc["MANAGER_VERSION_UPDATE"]} [v{version.CurrentVersionStable.ToString()}]");
+                Console.WriteLine(loc["MANAGER_VERSION_CURRENT"].FormatExt($"[v{Version.ToString()}]"));
+                Console.ForegroundColor = ConsoleColor.Gray;
+            }
+#else
+            else if (version.CurrentVersionPrerelease > Version)
+            {
+                Console.ForegroundColor = ConsoleColor.DarkYellow;
+                Console.WriteLine($"IW4MAdmin-Prerelease {loc["MANAGER_VERSION_UPDATE"]} [v{version.CurrentVersionPrerelease.ToString()}-pr]");
+                Console.WriteLine(loc["MANAGER_VERSION_CURRENT"].FormatExt($"[v{Version.ToString()}-pr]"));
+                Console.ForegroundColor = ConsoleColor.Gray;
+            }
+#endif
+            else
+            {
+                Console.ForegroundColor = ConsoleColor.Green;
+                Console.WriteLine(loc["MANAGER_VERSION_SUCCESS"]);
+                Console.ForegroundColor = ConsoleColor.Gray;
+            }
+        }
+
+        /// <summary>
+        /// reads input from the console and executes entered commands on the default server
+        /// </summary>
+        /// <returns></returns>
+        private static async Task ReadConsoleInput()
+        {
+            string lastCommand;
+            var Origin = Utilities.IW4MAdminClient(ServerManager.Servers[0]);
+
+            try
+            {
+                while (!ServerManager.CancellationToken.IsCancellationRequested)
+                {
+                    lastCommand = Console.ReadLine();
+
+                    if (lastCommand?.Length > 0)
+                    {
+                        if (lastCommand?.Length > 0)
+                        {
+                            GameEvent E = new GameEvent()
+                            {
+                                Type = GameEvent.EventType.Command,
+                                Data = lastCommand,
+                                Origin = Origin,
+                                Owner = ServerManager.Servers[0]
+                            };
+
+                            ServerManager.GetEventHandler().AddEvent(E);
+                            await E.WaitAsync(Utilities.DefaultCommandTimeout, ServerManager.CancellationToken);
+                            Console.Write('>');
+                        }
+                    }
+                }
+            }
+            catch (OperationCanceledException)
+            { }
+        }
+
+        private static void ConfigureServices()
+        {
+            var serviceProvider = new ServiceCollection();
+            serviceProvider.AddSingleton<IManager>(ServerManager);
+            var builder = serviceProvider.BuildServiceProvider();
+            builder.Dispose();
         }
     }
 }

Application/Migration/ConfigurationMigration.cs

@@ -15,6 +15,27 @@ namespace IW4MAdmin.Application.Migration
     /// </summary>
     class ConfigurationMigration
     {
+        /// <summary>
+        /// ensures required directories are created
+        /// </summary>
+        public static void CheckDirectories()
+        {
+            if (!Directory.Exists(Path.Join(Utilities.OperatingDirectory, "Plugins")))
+            {
+                Directory.CreateDirectory(Path.Join(Utilities.OperatingDirectory, "Plugins"));
+            }
+
+            if (!Directory.Exists(Path.Join(Utilities.OperatingDirectory, "Database")))
+            {
+                Directory.CreateDirectory(Path.Join(Utilities.OperatingDirectory, "Database"));
+            }
+
+            if (!Directory.Exists(Path.Join(Utilities.OperatingDirectory, "Log")))
+            {
+                Directory.CreateDirectory(Path.Join(Utilities.OperatingDirectory, "Log"));
+            }
+        }
+
         /// <summary>
         /// moves existing configs from the root folder into a configs folder
         /// </summary>

Application/Misc/EventProfiler.cs

@@ -0,0 +1,63 @@
+using SharedLibraryCore;
+using SharedLibraryCore.Interfaces;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace IW4MAdmin.Application.Misc
+{
+    internal class EventPerformance
+    {
+        public long ExecutionTime { get; set; }
+        public GameEvent Event { get; set; }
+        public string EventInfo => $"{Event.Type}, {Event.FailReason}, {Event.IsBlocking}, {Event.Data}, {Event.Message}, {Event.Extra}";
+    }
+
+    public class DuplicateKeyComparer<TKey> : IComparer<TKey> where TKey : IComparable
+    {
+        public int Compare(TKey x, TKey y)
+        {
+            int result = x.CompareTo(y);
+
+            if (result == 0)
+                return 1;
+            else
+                return result;
+        }
+    }
+
+    internal class EventProfiler
+    {
+        public double AverageEventTime { get; private set; }
+        public double MaxEventTime => Events.Values.Last().ExecutionTime;
+        public double MinEventTime => Events.Values[0].ExecutionTime;
+        public int TotalEventCount => Events.Count;
+        public SortedList<long, EventPerformance> Events { get; private set; } = new SortedList<long, EventPerformance>(new DuplicateKeyComparer<long>());
+        private readonly ILogger _logger;
+
+        public EventProfiler(ILogger logger)
+        {
+            _logger = logger;
+        }
+
+        public void Profile(DateTime start, DateTime end, GameEvent gameEvent)
+        {
+            _logger.WriteDebug($"Starting profile of event {gameEvent.Id}");
+            long executionTime = (long)Math.Round((end - start).TotalMilliseconds);
+
+            var perf = new EventPerformance()
+            {
+                Event = gameEvent,
+                ExecutionTime = executionTime
+            };
+
+            lock (Events)
+            {
+                Events.Add(executionTime, perf);
+            }
+
+            AverageEventTime = (AverageEventTime * (TotalEventCount - 1) + executionTime) / TotalEventCount;
+            _logger.WriteDebug($"Finished profile of event {gameEvent.Id}");
+        }
+    }
+}

Application/Misc/Logger.cs

@@ -1,12 +1,12 @@
 using SharedLibraryCore;
+using SharedLibraryCore.Interfaces;
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Threading;
 
 namespace IW4MAdmin.Application
 {
-    class Logger : SharedLibraryCore.Interfaces.ILogger
+    class Logger : ILogger
     {
         enum LogType
         {
@@ -19,16 +19,21 @@ namespace IW4MAdmin.Application
         }
 
         readonly string FileName;
-        readonly SemaphoreSlim OnLogWriting;
+        readonly ReaderWriterLockSlim WritingLock;
         static readonly short MAX_LOG_FILES = 10;
 
         public Logger(string fn)
         {
             FileName = Path.Join(Utilities.OperatingDirectory, "Log", $"{fn}.log");
-            OnLogWriting = new SemaphoreSlim(1, 1);
+            WritingLock = new ReaderWriterLockSlim();
             RotateLogs();
         }
 
+        ~Logger()
+        {
+            WritingLock.Dispose();
+        }
+
         /// <summary>
         /// rotates logs when log is initialized
         /// </summary>
@@ -55,9 +60,10 @@ namespace IW4MAdmin.Application
 
         void Write(string msg, LogType type)
         {
-            OnLogWriting.Wait();
+            WritingLock.EnterWriteLock();
 
             string stringType = type.ToString();
+            msg = msg.StripColors();
 
             try
             {
@@ -72,11 +78,13 @@ namespace IW4MAdmin.Application
 #if DEBUG
                 // lets keep it simple and dispose of everything quickly as logging wont be that much (relatively)
                 Console.WriteLine(LogLine);
-                File.AppendAllText(FileName, LogLine + Environment.NewLine);
+                //File.AppendAllText(FileName, $"{LogLine}{Environment.NewLine}");
+                //Debug.WriteLine(msg);
 #else
                 if (type == LogType.Error || type == LogType.Verbose)
+                {
                     Console.WriteLine(LogLine);
-                //if (type != LogType.Debug)
+                }
                 File.AppendAllText(FileName, $"{LogLine}{Environment.NewLine}");
 #endif
             }
@@ -87,7 +95,7 @@ namespace IW4MAdmin.Application
                 Console.WriteLine(ex.GetExceptionInfo());
             }
 
-            OnLogWriting.Release(1);
+            WritingLock.ExitWriteLock();
         }
 
         public void WriteVerbose(string msg)

Application/Misc/MiddlewareActionHandler.cs

@@ -0,0 +1,50 @@
+using SharedLibraryCore.Interfaces;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace IW4MAdmin.Application.Misc
+{
+    class MiddlewareActionHandler : IMiddlewareActionHandler
+    {
+        private static readonly IDictionary<string, IList<object>> _actions = new Dictionary<string, IList<object>>();
+
+        public async Task<T> Execute<T>(T value, string name = null)
+        {
+            string key = string.IsNullOrEmpty(name) ? typeof(T).ToString() : name;
+
+            if (_actions.ContainsKey(key))
+            {
+                foreach (var action in _actions[key])
+                {
+                    try
+                    {
+                        value = await ((IMiddlewareAction<T>)action).Invoke(value);
+                    }
+                    // todo: probably log this somewhere
+                    catch { }
+                }
+
+                return value;
+            }
+
+            return value;
+        }
+
+        public void Register<T>(T actionType, IMiddlewareAction<T> action, string name = null)
+        {
+            string key = string.IsNullOrEmpty(name) ? typeof(T).ToString() : name;
+
+            if (_actions.ContainsKey(key))
+            {
+                _actions[key].Add(action);
+            }
+
+            else
+            {
+                _actions.Add(key, new[] { action });
+            }
+        }
+    }
+}

Application/RconParsers/BaseRConParser.cs

@@ -12,7 +12,11 @@ using static SharedLibraryCore.Server;
 
 namespace IW4MAdmin.Application.RconParsers
 {
+#if DEBUG
+    public class BaseRConParser : IRConParser
+#else
     class BaseRConParser : IRConParser
+#endif
     {
         public BaseRConParser()
         {
@@ -32,9 +36,10 @@ namespace IW4MAdmin.Application.RconParsers
                     RConGetInfo = "ÿÿÿÿgetinfo",
                     RConResponse = "ÿÿÿÿprint",
                 },
+                ServerNotRunningResponse = "Server is not running."
             };
 
-            Configuration.Status.Pattern = @"^ *([0-9]+) +-?([0-9]+) +((?:[A-Z]+|[0-9]+)) +((?:[a-z]|[0-9]){8,32}|(?:[a-z]|[0-9]){8,32}|bot[0-9]+|(?:[0-9]+)) +(.{0,32}) +([0-9]+) +(\d+\.\d+\.\d+.\d+\:-*\d{1,5}|0+.0+:-*\d{1,5}|loopback) +(-*[0-9]+) +([0-9]+) *$";
+            Configuration.Status.Pattern = @"^ *([0-9]+) +-?([0-9]+) +((?:[A-Z]+|[0-9]+)) +((?:[a-z]|[0-9]){8,32}|(?:[a-z]|[0-9]){8,32}|bot[0-9]+|(?:[0-9]+)) *(.{0,32}) +([0-9]+) +(\d+\.\d+\.\d+.\d+\:-*\d{1,5}|0+.0+:-*\d{1,5}|loopback|unknown) +(-*[0-9]+) +([0-9]+) *$";
             Configuration.Status.AddMapping(ParserRegex.GroupType.RConClientNumber, 1);
             Configuration.Status.AddMapping(ParserRegex.GroupType.RConScore, 2);
             Configuration.Status.AddMapping(ParserRegex.GroupType.RConPing, 3);
@@ -48,11 +53,14 @@ namespace IW4MAdmin.Application.RconParsers
             Configuration.Dvar.AddMapping(ParserRegex.GroupType.RConDvarDefaultValue, 3);
             Configuration.Dvar.AddMapping(ParserRegex.GroupType.RConDvarLatchedValue, 4);
             Configuration.Dvar.AddMapping(ParserRegex.GroupType.RConDvarDomain, 5);
+
+            Configuration.MapStatus.Pattern = @"map: (([a-z]|_|\d)+)";
+            Configuration.MapStatus.AddMapping(ParserRegex.GroupType.RConStatusMap, 1);
         }
 
         public IRConParserConfiguration Configuration { get; set; }
 
-        public string Version { get; set; } = "CoD";
+        public virtual string Version { get; set; } = "CoD";
         public Game GameName { get; set; } = Game.COD;
         public bool CanGenerateLogPath { get; set; } = true;
 
@@ -66,42 +74,61 @@ namespace IW4MAdmin.Application.RconParsers
         {
             string[] lineSplit = await connection.SendQueryAsync(StaticHelpers.QueryType.GET_DVAR, dvarName);
             string response = string.Join('\n', lineSplit.Skip(1));
-
-            if (!lineSplit[0].Contains(Configuration.CommandPrefixes.RConResponse))
-            {
-                throw new DvarException($"Could not retrieve DVAR \"{dvarName}\"");
-            }
-
-            if (response.Contains("Unknown command"))
-            {
-                throw new DvarException($"DVAR \"{dvarName}\" does not exist");
-            }
-
             var match = Regex.Match(response, Configuration.Dvar.Pattern);
 
-            if (!match.Success)
+            if (!lineSplit[0].Contains(Configuration.CommandPrefixes.RConResponse) ||
+                response.Contains("Unknown command") ||
+                !match.Success)
             {
-                throw new DvarException($"Could not retrieve DVAR \"{dvarName}\"");
+                throw new DvarException(Utilities.CurrentLocalization.LocalizationIndex["SERVER_ERROR_DVAR"].FormatExt(dvarName));
             }
 
-            string value = match.Groups[Configuration.Dvar.GroupMapping[ParserRegex.GroupType.RConDvarValue]].Value.StripColors();
-            string defaultValue = match.Groups[Configuration.Dvar.GroupMapping[ParserRegex.GroupType.RConDvarDefaultValue]].Value.StripColors();
-            string latchedValue = match.Groups[Configuration.Dvar.GroupMapping[ParserRegex.GroupType.RConDvarLatchedValue]].Value.StripColors();
+            string value = match.Groups[Configuration.Dvar.GroupMapping[ParserRegex.GroupType.RConDvarValue]].Value;
+            string defaultValue = match.Groups[Configuration.Dvar.GroupMapping[ParserRegex.GroupType.RConDvarDefaultValue]].Value;
+            string latchedValue = match.Groups[Configuration.Dvar.GroupMapping[ParserRegex.GroupType.RConDvarLatchedValue]].Value;
+
+            string removeTrailingColorCode(string input) => Regex.Replace(input, @"\^7$", "");
+
+
+            value = removeTrailingColorCode(value);
+            defaultValue = removeTrailingColorCode(defaultValue);
+            latchedValue = removeTrailingColorCode(latchedValue);
 
             return new Dvar<T>()
             {
-                Name = match.Groups[Configuration.Dvar.GroupMapping[ParserRegex.GroupType.RConDvarName]].Value.StripColors(),
-                Value = string.IsNullOrEmpty(value) ? default(T) : (T)Convert.ChangeType(value, typeof(T)),
-                DefaultValue = string.IsNullOrEmpty(defaultValue) ? default(T) : (T)Convert.ChangeType(defaultValue, typeof(T)),
-                LatchedValue = string.IsNullOrEmpty(latchedValue) ? default(T) : (T)Convert.ChangeType(latchedValue, typeof(T)),
-                Domain = match.Groups[Configuration.Dvar.GroupMapping[ParserRegex.GroupType.RConDvarDomain]].Value.StripColors()
+                Name = match.Groups[Configuration.Dvar.GroupMapping[ParserRegex.GroupType.RConDvarName]].Value,
+                Value = string.IsNullOrEmpty(value) ? default : (T)Convert.ChangeType(value, typeof(T)),
+                DefaultValue = string.IsNullOrEmpty(defaultValue) ? default : (T)Convert.ChangeType(defaultValue, typeof(T)),
+                LatchedValue = string.IsNullOrEmpty(latchedValue) ? default : (T)Convert.ChangeType(latchedValue, typeof(T)),
+                Domain = match.Groups[Configuration.Dvar.GroupMapping[ParserRegex.GroupType.RConDvarDomain]].Value
             };
         }
 
-        public async Task<List<EFClient>> GetStatusAsync(Connection connection)
+        public virtual async Task<(List<EFClient>, string)> GetStatusAsync(Connection connection)
         {
             string[] response = await connection.SendQueryAsync(StaticHelpers.QueryType.COMMAND_STATUS);
-            return ClientsFromStatus(response);
+#if DEBUG
+            foreach (var line in response)
+            {
+                Console.WriteLine(line);
+            }
+#endif
+            return (ClientsFromStatus(response), MapFromStatus(response));
+        }
+
+        private string MapFromStatus(string[] response)
+        {
+            string map = null;
+            foreach (var line in response)
+            {
+                var regex = Regex.Match(line, Configuration.MapStatus.Pattern);
+                if (regex.Success)
+                {
+                    map = regex.Groups[Configuration.MapStatus.GroupMapping[ParserRegex.GroupType.RConStatusMap]].ToString();
+                }
+            }
+
+            return map;
         }
 
         public async Task<bool> SetDvarAsync(Connection connection, string dvarName, object dvarValue)
@@ -115,7 +142,7 @@ namespace IW4MAdmin.Application.RconParsers
 
             if (Status.Length < 4)
             {
-                throw new ServerException("Unexpected status response received");
+                throw new ServerException(Utilities.CurrentLocalization.LocalizationIndex["SERVER_ERROR_UNEXPECTED_STATUS"]);
             }
 
             int validMatches = 0;
@@ -139,30 +166,41 @@ namespace IW4MAdmin.Application.RconParsers
                         ping = int.Parse(regex.Groups[Configuration.Status.GroupMapping[ParserRegex.GroupType.RConPing]].Value);
                     }
 
-                    long networkId = regex.Groups[Configuration.Status.GroupMapping[ParserRegex.GroupType.RConNetworkId]].Value.ConvertLong();
-                    string name = regex.Groups[Configuration.Status.GroupMapping[ParserRegex.GroupType.RConName]].Value.StripColors().Trim();
+                    long networkId;
+                    try
+                    {
+                        networkId = regex.Groups[Configuration.Status.GroupMapping[ParserRegex.GroupType.RConNetworkId]].Value.ConvertGuidToLong();
+                    }
+
+                    catch (FormatException)
+                    {
+                        continue;
+                    }
+
+                    string name = regex.Groups[Configuration.Status.GroupMapping[ParserRegex.GroupType.RConName]].Value.Trim();
                     int? ip = regex.Groups[Configuration.Status.GroupMapping[ParserRegex.GroupType.RConIpAddress]].Value.Split(':')[0].ConvertToIP();
 
                     var client = new EFClient()
                     {
                         CurrentAlias = new EFAlias()
                         {
-                            Name = name
+                            Name = name,
+                            IPAddress = ip
                         },
                         NetworkId = networkId,
                         ClientNumber = clientNumber,
-                        IPAddress = ip,
                         Ping = ping,
                         Score = score,
-                        IsBot = ip == null,
                         State = EFClient.ClientState.Connecting
                     };
 
-                    //// they've not fully connected yet
-                    //if (!client.IsBot && ping == 999)
-                    //{
-                    //    continue;
-                    //}
+#if DEBUG
+                    if (client.NetworkId < 1000 && client.NetworkId > 0)
+                    {
+                        client.IPAddress = 2147483646;
+                        client.Ping = 0;
+                    }
+#endif
 
                     StatusPlayers.Add(client);
                 }
@@ -171,7 +209,7 @@ namespace IW4MAdmin.Application.RconParsers
             // this happens if status is requested while map is rotating
             if (Status.Length > 5 && validMatches == 0)
             {
-                throw new ServerException("Server is rotating map");
+                throw new ServerException(Utilities.CurrentLocalization.LocalizationIndex["SERVER_ERROR_ROTATING_MAP"]);
             }
 
             return StatusPlayers;

Application/RconParsers/DynamicRConParserConfiguration.cs

@@ -1,5 +1,4 @@
-using SharedLibraryCore;
-using SharedLibraryCore.Interfaces;
+using SharedLibraryCore.Interfaces;
 using SharedLibraryCore.RCon;
 
 namespace IW4MAdmin.Application.RconParsers
@@ -12,7 +11,9 @@ namespace IW4MAdmin.Application.RconParsers
     {
         public CommandPrefix CommandPrefixes { get; set; }
         public ParserRegex Status { get; set; } = new ParserRegex();
+        public ParserRegex MapStatus { get; set; } = new ParserRegex();
         public ParserRegex Dvar { get; set; } = new ParserRegex();
+        public string ServerNotRunningResponse { get; set; }
         public bool WaitForResponse { get; set; } = true;
     }
 }

GameFiles/IW4x/userraw/_commands.gsc

@@ -5,13 +5,15 @@
 
 init()
 {
+/*
 	SetDvarIfUninitialized("sv_team_balance_assignments", "");
 	SetDvarIfUninitialized("sv_iw4madmin_serverid", 0);
 	SetDvarIfUninitialized("sv_iw4madmin_apiurl", "http://127.0.0.1:1624/api/gsc/");
 	level.apiUrl = GetDvar("sv_iw4madmin_apiurl");
-	//level thread WaitForCommand();
+	level thread WaitForCommand();
 	level thread onPlayerConnect();
 	level thread onPlayerDisconnect();
+*/
 }
 
 onPlayerConnect()

GameFiles/IW4x/userraw/_customcallbacks.gsc

@@ -0,0 +1,256 @@
+#include maps\mp\_utility;
+#include maps\mp\gametypes\_hud_util;
+#include common_scripts\utility;
+
+init()
+{
+	SetDvarIfUninitialized( "sv_customcallbacks", true );
+	SetDvarIfUninitialized( "sv_framewaittime", 0.05 );
+	SetDvarIfUninitialized( "sv_additionalwaittime", 0.1 );
+	SetDvarIfUninitialized( "sv_maxstoredframes", 12 );
+	SetDvarIfUninitialized( "sv_printradarupdates", 0 );
+	SetDvarIfUninitialized( "sv_printradar_updateinterval", 500 );
+	SetDvarIfUninitialized( "sv_iw4madmin_url", "http://127.0.0.1:1624" );
+	
+	level thread onPlayerConnect();
+	if (getDvarInt("sv_printradarupdates") == 1)
+	{
+		level thread runRadarUpdates();
+	}
+	
+	level waittill( "prematch_over" );
+	level.callbackPlayerKilled = ::Callback_PlayerKilled;
+	level.callbackPlayerDamage = ::Callback_PlayerDamage;
+	level.callbackPlayerDisconnect = ::Callback_PlayerDisconnect;
+}
+
+onPlayerConnect( player )
+{
+	for( ;; )
+	{
+		level waittill( "connected", player );	
+		player setClientDvar("cl_autorecord", 1);
+		player setClientDvar("cl_demosKeep", 200);
+		player thread waitForFrameThread();
+		player thread waitForAttack();
+	}
+}
+
+waitForAttack()
+{
+	self endon( "disconnect" );
+	
+	self.lastAttackTime = 0;
+	
+	for( ;; )
+	{
+		self notifyOnPlayerCommand( "player_shot", "+attack" );
+		self waittill( "player_shot" );
+		
+		self.lastAttackTime = getTime();
+	}
+}
+
+getHttpString( url )
+{
+    request = httpGet( url );
+    request waittill( "done", success, data );
+	request destroy();
+}
+
+runRadarUpdates()
+{
+	interval = int(getDvar("sv_printradar_updateinterval"));
+
+	for ( ;; )
+	{
+		for ( i = 0; i <= 17; i++ )
+		{
+			player = level.players[i];
+
+			if ( isDefined( player ) )
+			{
+				payload = player.guid + ";" + player.origin + ";" + player getPlayerAngles() + ";" + player.team + ";" + player.kills + ";" + player.deaths + ";" + player.score + ";" + player GetCurrentWeapon() + ";" + player.health + ";" + isAlive(player) + ";" + player.timePlayed["total"];
+				logPrint( "LiveRadar;" + payload + "\n" );
+			}	
+		}
+
+		wait( interval / 1000 );
+	}	
+}
+
+hitLocationToBone( hitloc )
+{
+	switch( hitloc )
+	{
+		case "helmet":
+			return "j_helmet";
+		case "head":
+			return "j_head";
+		case "neck":
+			return "j_neck";
+		case "torso_upper":
+			return "j_spineupper";
+		case "torso_lower":
+			return "j_spinelower";
+		case "right_arm_upper":
+			return "j_shoulder_ri";
+		case "left_arm_upper":
+			return "j_shoulder_le";
+		case "right_arm_lower":
+			return "j_elbow_ri";
+		case "left_arm_lower":
+			return "j_elbow_le";
+		case "right_hand":
+			return "j_wrist_ri";
+		case "left_hand":
+			return "j_wrist_le";
+		case "right_leg_upper":
+			return "j_hip_ri";
+		case "left_leg_upper":
+			return "j_hip_le";
+		case "right_leg_lower":
+			return "j_knee_ri";
+		case "left_leg_lower":
+			return "j_knee_le";
+		case "right_foot":
+			return "j_ankle_ri";
+		case "left_foot":
+			return "j_ankle_le";
+		default:
+			return "tag_origin";
+	}
+}
+
+waitForFrameThread()
+{
+	self endon( "disconnect" );
+	
+	self.currentAnglePosition = 0;
+	self.anglePositions = [];
+
+	for (i = 0; i < getDvarInt( "sv_maxstoredframes" ); i++)
+	{
+		self.anglePositions[i] = self getPlayerAngles();
+	}
+		
+	for( ;; )
+	{
+		self.anglePositions[self.currentAnglePosition] = self getPlayerAngles();
+		wait( getDvarFloat( "sv_framewaittime" ) );	
+		self.currentAnglePosition = (self.currentAnglePosition + 1) % getDvarInt( "sv_maxstoredframes" );
+	}
+}
+
+waitForAdditionalAngles( logString, beforeFrameCount, afterFrameCount )
+{
+	currentIndex = self.currentAnglePosition;
+	wait( 0.05 * afterFrameCount );
+	
+	self.angleSnapshot = [];
+	
+	for( j = 0; j < self.anglePositions.size; j++ )
+	{
+		self.angleSnapshot[j] = self.anglePositions[j];
+	}
+
+	anglesStr = "";
+	collectedFrames = 0;
+	i = currentIndex - beforeFrameCount;
+
+	while (collectedFrames < beforeFrameCount)
+	{
+		fixedIndex = i;
+		if (i < 0)
+		{
+			fixedIndex = self.angleSnapshot.size - abs(i);
+		}
+		anglesStr += self.angleSnapshot[int(fixedIndex)] + ":";
+		collectedFrames++;
+		i++;
+	}
+
+	if (i == currentIndex)
+	{
+		anglesStr += self.angleSnapshot[i] + ":";
+		i++;
+	}
+
+	collectedFrames = 0;
+
+	while (collectedFrames < afterFrameCount)
+	{
+		fixedIndex = i;
+		if (i > self.angleSnapshot.size - 1)
+		{
+			fixedIndex = i % self.angleSnapshot.size;
+		}
+		anglesStr += self.angleSnapshot[int(fixedIndex)] + ":";
+		collectedFrames++;
+		i++;
+	}
+
+	lastAttack = int(getTime()) - int(self.lastAttackTime);
+	isAlive = isAlive(self);
+
+	logPrint(logString + ";" + anglesStr + ";" + isAlive + ";" + lastAttack + "\n" ); 
+}
+
+vectorScale( vector, scale )
+{
+	return ( vector[0] * scale, vector[1] * scale, vector[2] * scale );
+}
+
+Process_Hit( type, attacker, sHitLoc, sMeansOfDeath, iDamage, sWeapon )
+{
+	if (sMeansOfDeath == "MOD_FALLING" || !isPlayer(attacker))
+	{
+		return;
+	}
+
+	victim = self;
+	_attacker = attacker;
+
+	if ( !isPlayer( attacker ) && isDefined( attacker.owner ) )
+	{
+		_attacker = attacker.owner;
+	}
+
+	else if( !isPlayer( attacker ) && sMeansOfDeath == "MOD_FALLING" )
+	{
+		_attacker = victim;
+	}
+	
+	location = victim GetTagOrigin( hitLocationToBone( sHitLoc ) );
+	isKillstreakKill = !isPlayer( attacker ) || isKillstreakWeapon( sWeapon );
+
+	logLine = "Script" + type + ";" + _attacker.guid + ";" + victim.guid + ";" + _attacker GetTagOrigin("tag_eye") + ";" + location + ";" + iDamage + ";" + sWeapon + ";" + sHitLoc + ";" + sMeansOfDeath + ";" + _attacker getPlayerAngles() + ";" + int(gettime()) + ";" + isKillstreakKill + ";" +  _attacker playerADS() + ";0;0";
+	attacker thread waitForAdditionalAngles( logLine, 2, 2 );
+}
+
+Callback_PlayerDamage( eInflictor, attacker, iDamage, iDFlags, sMeansOfDeath, sWeapon, vPoint, vDir, sHitLoc, psOffsetTime )
+{
+	if ( level.teamBased && isDefined( attacker ) && ( self != attacker ) && isDefined( attacker.team ) && ( self.pers[ "team" ] == attacker.team ) )
+	{
+		return;
+	}
+		
+	if ( self.health - iDamage > 0 )
+	{
+		self Process_Hit( "Damage", attacker, sHitLoc, sMeansOfDeath, iDamage, sWeapon );
+	}
+
+	self maps\mp\gametypes\_damage::Callback_PlayerDamage( eInflictor, attacker, iDamage, iDFlags, sMeansOfDeath, sWeapon, vPoint, vDir, sHitLoc, psOffsetTime );
+}
+
+Callback_PlayerKilled( eInflictor, attacker, iDamage, sMeansOfDeath, sWeapon, vDir, sHitLoc, psOffsetTime, deathAnimDuration )
+{
+	Process_Hit( "Kill", attacker, sHitLoc, sMeansOfDeath, iDamage, sWeapon );
+	self maps\mp\gametypes\_damage::Callback_PlayerKilled( eInflictor, attacker, iDamage, sMeansOfDeath, sWeapon, vDir, sHitLoc, psOffsetTime, deathAnimDuration );
+}
+
+Callback_PlayerDisconnect()
+{
+	level notify( "disconnected", self );
+	self maps\mp\gametypes\_playerlogic::Callback_PlayerDisconnect();
+}

GameLogServer/GameLogServer/log_reader.py

@@ -1,6 +1,8 @@
 import re
 import os
 import time
+import random
+import string
 
 class LogReader(object):
     def __init__(self):
@@ -8,7 +10,7 @@ class LogReader(object):
         # (if the time between checks is greater, ignore ) - in seconds
         self.max_file_time_change = 30
 
-    def read_file(self, path):
+    def read_file(self, path, retrieval_key):
         # this removes old entries that are no longer valid
         try:
             self._clear_old_logs()
@@ -22,57 +24,88 @@ class LogReader(object):
 
         # prevent traversing directories
         if re.search('r^.+\.\.\\.+$', path):
-            return False
+            return self._generate_bad_response()
+
         # must be a valid log path and log file
         if not re.search(r'^.+[\\|\/](.+)[\\|\/].+.log$', path):
-            return False
+            return self._generate_bad_response()
 
         # get the new file size
         new_file_size = self.file_length(path)
           
         # the log size was unable to be read (probably the wrong path)
         if new_file_size < 0:
-            return False
+            return self._generate_bad_response()
 
-        # this is the first time the log has been requested
-        if path not in self.log_file_sizes:
-            self.log_file_sizes[path] = { 
-                'length' : new_file_size,
-                'read': time.time()
+        next_retrieval_key = self._generate_key()
+
+        # this is the first time the key has been requested, so we need to the next one
+        if retrieval_key not in self.log_file_sizes or int(time.time() - self.log_file_sizes[retrieval_key]['read']) > self.max_file_time_change:
+            print('retrieval key "%s" does not exist or is outdated' % retrieval_key)
+            last_log_info = {
+                'size' : new_file_size,
+                'previous_key' : None
             }
-            return ''
+        else:
+            last_log_info = self.log_file_sizes[retrieval_key]
 
-        # grab the previous values
-        last_length = self.log_file_sizes[path]['length']
-        file_size_difference = new_file_size - last_length
+        print('next key is %s' % next_retrieval_key)
+        expired_key = last_log_info['previous_key']
+        print('expired key is %s' % expired_key)
 
-        # update the new size and actually read the data
-        self.log_file_sizes[path] = {
-            'length': new_file_size,
-            'read': time.time()
+        # grab the previous value
+        last_size = last_log_info['size']
+        file_size_difference = new_file_size - last_size
+
+        #print('generating info for next key %s' % next_retrieval_key)
+
+        # update the new size
+        self.log_file_sizes[next_retrieval_key] = {
+            'size' : new_file_size,
+            'read': time.time(),
+            'next_key': next_retrieval_key,
+            'previous_key': retrieval_key
         }
 
-        new_log_info = self.get_file_lines(path, file_size_difference)
-        return new_log_info
+        if expired_key in self.log_file_sizes:
+            print('deleting expired key %s' % expired_key)
+            del self.log_file_sizes[expired_key]
 
-    def get_file_lines(self, path, length):
+        #print('reading %i bytes starting at %i' % (file_size_difference, last_size))
+
+        new_log_content = self.get_file_lines(path, last_size, file_size_difference)
+        return {
+            'content': new_log_content,
+            'next_key': next_retrieval_key
+        }
+
+    def get_file_lines(self, path, start_position, length_to_read):
         try:
             file_handle = open(path, 'rb')
-            file_handle.seek(-length, 2)
-            file_data = file_handle.read(length)
+            file_handle.seek(start_position)
+            file_data = file_handle.read(length_to_read)
             file_handle.close()
             # using ignore errors omits the pesky 0xb2 bytes we're reading in for some reason
             return file_data.decode('utf-8', errors='ignore')
         except Exception as e:
-            print('could not read the log file at {0}, wanted to read {1} bytes'.format(path, length))
+            print('could not read the log file at {0}, wanted to read {1} bytes'.format(path, length_to_read))
             print(e)
             return False
 
     def _clear_old_logs(self):
         expired_logs = [path for path in self.log_file_sizes if int(time.time() - self.log_file_sizes[path]['read']) > self.max_file_time_change]
-        for log in expired_logs:
-            print('removing expired log {0}'.format(log))
-            del self.log_file_sizes[log]
+        for key in expired_logs:
+            print('removing expired log with key {0}'.format(key))
+            del self.log_file_sizes[key]
+
+    def _generate_bad_response(self):
+        return {
+            'content': None,
+            'next_key': None
+        }
+
+    def _generate_key(self):
+        return ''.join(random.choices(string.ascii_uppercase + string.digits, k=8))
         
     def file_length(self, path):
         try:

GameLogServer/GameLogServer/log_resource.py

@@ -3,12 +3,14 @@ from GameLogServer.log_reader import reader
 from base64 import urlsafe_b64decode
 
 class LogResource(Resource):
-    def get(self, path):
+    def get(self, path, retrieval_key):
         path = urlsafe_b64decode(path).decode('utf-8')
-        log_info = reader.read_file(path)
+        log_info = reader.read_file(path, retrieval_key)
+        content = log_info['content']
 
         return {
-            'success' : log_info is not False,
-            'length':  0 if log_info is False else len(log_info),
-            'data': log_info
+            'success' : content is not None,
+            'length':  0 if content is None else len(content),
+            'data': content,
+            'next_key': log_info['next_key']
         }

GameLogServer/GameLogServer/server.py

@@ -10,5 +10,5 @@ def init():
     log = logging.getLogger('werkzeug')
     log.setLevel(logging.ERROR)
     api = Api(app)
-    api.add_resource(LogResource, '/log/<string:path>')
+    api.add_resource(LogResource, '/log/<string:path>/<string:retrieval_key>')
     #api.add_resource(RestartResource, '/restart')

GameLogServer/requirements.txt

@@ -9,4 +9,4 @@ pip==10.0.1
 pytz==2018.9
 setuptools==39.0.1
 six==1.12.0
-Werkzeug==0.15.2
+Werkzeug==0.16.0

IW4MAdmin.sln

@@ -1,13 +1,15 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26730.16
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29009.5
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Plugins", "Plugins", "{26E8B310-269E-46D4-A612-24601F16065F}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8C8F3945-0AEF-4949-A1F7-B18E952E50BC}"
 	ProjectSection(SolutionItems) = preProject
-		_commands.gsc = _commands.gsc
-		_customcallbacks.gsc = _customcallbacks.gsc
+		GameFiles\IW4x\userraw\_commands.gsc = GameFiles\IW4x\userraw\_commands.gsc
+		GameFiles\IW4x\userraw\_customcallbacks.gsc = GameFiles\IW4x\userraw\_customcallbacks.gsc
+		azure-pipelines.yml = azure-pipelines.yml
+		PostPublish.ps1 = PostPublish.ps1
 		README.md = README.md
 		RunPublishPre.cmd = RunPublishPre.cmd
 		RunPublishRelease.cmd = RunPublishRelease.cmd
@@ -34,8 +36,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tests", "Plugins\Tests\Test
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IW4ScriptCommands", "Plugins\IW4ScriptCommands\IW4ScriptCommands.csproj", "{6C706CE5-A206-4E46-8712-F8C48D526091}"
 EndProject
-Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "DiscordWebhook", "DiscordWebhook\DiscordWebhook.pyproj", "{15A81D6E-7502-46CE-8530-0647A380B5F4}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ScriptPlugins", "ScriptPlugins", "{3F9ACC27-26DB-49FA-BCD2-50C54A49C9FA}"
 	ProjectSection(SolutionItems) = preProject
 		Plugins\ScriptPlugins\ParserCoD4x.js = Plugins\ScriptPlugins\ParserCoD4x.js
@@ -55,6 +55,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StatsWeb", "Plugins\Web\Sta
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutomessageFeed", "Plugins\AutomessageFeed\AutomessageFeed.csproj", "{F5815359-CFC7-44B4-9A3B-C04BACAD5836}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LiveRadar", "Plugins\LiveRadar\LiveRadar.csproj", "{00A1FED2-2254-4AF7-A5DB-2357FA7C88CD}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -286,7 +288,6 @@ Global
 		{B72DEBFB-9D48-4076-8FF5-1FD72A830845}.Release|x86.ActiveCfg = Release|Any CPU
 		{B72DEBFB-9D48-4076-8FF5-1FD72A830845}.Release|x86.Build.0 = Release|Any CPU
 		{6C706CE5-A206-4E46-8712-F8C48D526091}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6C706CE5-A206-4E46-8712-F8C48D526091}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6C706CE5-A206-4E46-8712-F8C48D526091}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{6C706CE5-A206-4E46-8712-F8C48D526091}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{6C706CE5-A206-4E46-8712-F8C48D526091}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -294,7 +295,6 @@ Global
 		{6C706CE5-A206-4E46-8712-F8C48D526091}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{6C706CE5-A206-4E46-8712-F8C48D526091}.Debug|x86.Build.0 = Debug|Any CPU
 		{6C706CE5-A206-4E46-8712-F8C48D526091}.Prerelease|Any CPU.ActiveCfg = Prerelease|Any CPU
-		{6C706CE5-A206-4E46-8712-F8C48D526091}.Prerelease|Any CPU.Build.0 = Prerelease|Any CPU
 		{6C706CE5-A206-4E46-8712-F8C48D526091}.Prerelease|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{6C706CE5-A206-4E46-8712-F8C48D526091}.Prerelease|Mixed Platforms.Build.0 = Debug|Any CPU
 		{6C706CE5-A206-4E46-8712-F8C48D526091}.Prerelease|x64.ActiveCfg = Debug|Any CPU
@@ -302,25 +302,12 @@ Global
 		{6C706CE5-A206-4E46-8712-F8C48D526091}.Prerelease|x86.ActiveCfg = Debug|Any CPU
 		{6C706CE5-A206-4E46-8712-F8C48D526091}.Prerelease|x86.Build.0 = Debug|Any CPU
 		{6C706CE5-A206-4E46-8712-F8C48D526091}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6C706CE5-A206-4E46-8712-F8C48D526091}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6C706CE5-A206-4E46-8712-F8C48D526091}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{6C706CE5-A206-4E46-8712-F8C48D526091}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{6C706CE5-A206-4E46-8712-F8C48D526091}.Release|x64.ActiveCfg = Release|Any CPU
 		{6C706CE5-A206-4E46-8712-F8C48D526091}.Release|x64.Build.0 = Release|Any CPU
 		{6C706CE5-A206-4E46-8712-F8C48D526091}.Release|x86.ActiveCfg = Release|Any CPU
 		{6C706CE5-A206-4E46-8712-F8C48D526091}.Release|x86.Build.0 = Release|Any CPU
-		{15A81D6E-7502-46CE-8530-0647A380B5F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{15A81D6E-7502-46CE-8530-0647A380B5F4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{15A81D6E-7502-46CE-8530-0647A380B5F4}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{15A81D6E-7502-46CE-8530-0647A380B5F4}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{15A81D6E-7502-46CE-8530-0647A380B5F4}.Prerelease|Any CPU.ActiveCfg = Prerelease|Any CPU
-		{15A81D6E-7502-46CE-8530-0647A380B5F4}.Prerelease|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{15A81D6E-7502-46CE-8530-0647A380B5F4}.Prerelease|x64.ActiveCfg = Release|Any CPU
-		{15A81D6E-7502-46CE-8530-0647A380B5F4}.Prerelease|x86.ActiveCfg = Release|Any CPU
-		{15A81D6E-7502-46CE-8530-0647A380B5F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{15A81D6E-7502-46CE-8530-0647A380B5F4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{15A81D6E-7502-46CE-8530-0647A380B5F4}.Release|x64.ActiveCfg = Release|Any CPU
-		{15A81D6E-7502-46CE-8530-0647A380B5F4}.Release|x86.ActiveCfg = Release|Any CPU
 		{42EFDA12-10D3-4C40-A210-9483520116BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{42EFDA12-10D3-4C40-A210-9483520116BC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{42EFDA12-10D3-4C40-A210-9483520116BC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
@@ -375,8 +362,8 @@ Global
 		{F5815359-CFC7-44B4-9A3B-C04BACAD5836}.Debug|x64.Build.0 = Debug|Any CPU
 		{F5815359-CFC7-44B4-9A3B-C04BACAD5836}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{F5815359-CFC7-44B4-9A3B-C04BACAD5836}.Debug|x86.Build.0 = Debug|Any CPU
-		{F5815359-CFC7-44B4-9A3B-C04BACAD5836}.Prerelease|Any CPU.ActiveCfg = Debug|Any CPU
-		{F5815359-CFC7-44B4-9A3B-C04BACAD5836}.Prerelease|Any CPU.Build.0 = Debug|Any CPU
+		{F5815359-CFC7-44B4-9A3B-C04BACAD5836}.Prerelease|Any CPU.ActiveCfg = Prerelease|Any CPU
+		{F5815359-CFC7-44B4-9A3B-C04BACAD5836}.Prerelease|Any CPU.Build.0 = Prerelease|Any CPU
 		{F5815359-CFC7-44B4-9A3B-C04BACAD5836}.Prerelease|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{F5815359-CFC7-44B4-9A3B-C04BACAD5836}.Prerelease|Mixed Platforms.Build.0 = Debug|Any CPU
 		{F5815359-CFC7-44B4-9A3B-C04BACAD5836}.Prerelease|x64.ActiveCfg = Debug|Any CPU
@@ -391,6 +378,30 @@ Global
 		{F5815359-CFC7-44B4-9A3B-C04BACAD5836}.Release|x64.Build.0 = Release|Any CPU
 		{F5815359-CFC7-44B4-9A3B-C04BACAD5836}.Release|x86.ActiveCfg = Release|Any CPU
 		{F5815359-CFC7-44B4-9A3B-C04BACAD5836}.Release|x86.Build.0 = Release|Any CPU
+		{00A1FED2-2254-4AF7-A5DB-2357FA7C88CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{00A1FED2-2254-4AF7-A5DB-2357FA7C88CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{00A1FED2-2254-4AF7-A5DB-2357FA7C88CD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{00A1FED2-2254-4AF7-A5DB-2357FA7C88CD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{00A1FED2-2254-4AF7-A5DB-2357FA7C88CD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{00A1FED2-2254-4AF7-A5DB-2357FA7C88CD}.Debug|x64.Build.0 = Debug|Any CPU
+		{00A1FED2-2254-4AF7-A5DB-2357FA7C88CD}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{00A1FED2-2254-4AF7-A5DB-2357FA7C88CD}.Debug|x86.Build.0 = Debug|Any CPU
+		{00A1FED2-2254-4AF7-A5DB-2357FA7C88CD}.Prerelease|Any CPU.ActiveCfg = Prerelease|Any CPU
+		{00A1FED2-2254-4AF7-A5DB-2357FA7C88CD}.Prerelease|Any CPU.Build.0 = Prerelease|Any CPU
+		{00A1FED2-2254-4AF7-A5DB-2357FA7C88CD}.Prerelease|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{00A1FED2-2254-4AF7-A5DB-2357FA7C88CD}.Prerelease|Mixed Platforms.Build.0 = Debug|Any CPU
+		{00A1FED2-2254-4AF7-A5DB-2357FA7C88CD}.Prerelease|x64.ActiveCfg = Debug|Any CPU
+		{00A1FED2-2254-4AF7-A5DB-2357FA7C88CD}.Prerelease|x64.Build.0 = Debug|Any CPU
+		{00A1FED2-2254-4AF7-A5DB-2357FA7C88CD}.Prerelease|x86.ActiveCfg = Debug|Any CPU
+		{00A1FED2-2254-4AF7-A5DB-2357FA7C88CD}.Prerelease|x86.Build.0 = Debug|Any CPU
+		{00A1FED2-2254-4AF7-A5DB-2357FA7C88CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{00A1FED2-2254-4AF7-A5DB-2357FA7C88CD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{00A1FED2-2254-4AF7-A5DB-2357FA7C88CD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{00A1FED2-2254-4AF7-A5DB-2357FA7C88CD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{00A1FED2-2254-4AF7-A5DB-2357FA7C88CD}.Release|x64.ActiveCfg = Release|Any CPU
+		{00A1FED2-2254-4AF7-A5DB-2357FA7C88CD}.Release|x64.Build.0 = Release|Any CPU
+		{00A1FED2-2254-4AF7-A5DB-2357FA7C88CD}.Release|x86.ActiveCfg = Release|Any CPU
+		{00A1FED2-2254-4AF7-A5DB-2357FA7C88CD}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -406,6 +417,7 @@ Global
 		{A848FCF1-8527-4AA8-A1AA-50D29695C678} = {26E8B310-269E-46D4-A612-24601F16065F}
 		{776B348B-F818-4A0F-A625-D0AF8BAD3E9B} = {A848FCF1-8527-4AA8-A1AA-50D29695C678}
 		{F5815359-CFC7-44B4-9A3B-C04BACAD5836} = {26E8B310-269E-46D4-A612-24601F16065F}
+		{00A1FED2-2254-4AF7-A5DB-2357FA7C88CD} = {26E8B310-269E-46D4-A612-24601F16065F}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {84F8F8E0-1F73-41E0-BD8D-BB6676E2EE87}

Master/master/context/history.py

@@ -8,7 +8,7 @@ class History():
         self.server_history = list()
 
     def add_client_history(self, client_num):
-        if len(self.client_history) > 2880:
+        if len(self.client_history) > 20160:
             self.client_history = self.client_history[1:]
         self.client_history.append({
             'count' : client_num,
@@ -16,7 +16,7 @@ class History():
         })
 
     def add_server_history(self, server_num):
-        if len(self.server_history) > 2880:
+        if len(self.server_history) > 20160:
             self.server_history = self.server_history[1:]
         self.server_history.append({
              'count' : server_num,
@@ -24,7 +24,7 @@ class History():
         })
   
     def add_instance_history(self, instance_num):
-        if len(self.instance_history) > 2880:
+        if len(self.instance_history) > 20160:
             self.instance_history = self.instance_history[1:]
         self.instance_history.append({
             'count' : instance_num,

Master/master/schema/serverschema.py

@@ -23,7 +23,7 @@ class ServerSchema(Schema):
     )
     hostname = fields.String(
         required=True,
-        validate=validate.Length(1, 64, 'invalid hostname')
+        validate=validate.Length(1, 128, 'invalid hostname')
     )
     clientnum = fields.Int(
         required=True,

Master/requirements.txt

@@ -23,4 +23,4 @@ six==1.11.0
 timeago==1.0.8
 tzlocal==1.5.1
 urllib3==1.24
-Werkzeug==0.14.1
+Werkzeug==0.15.3

Plugins/AutomessageFeed/AutomessageFeed.csproj

@@ -1,21 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
-    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
+    <LangVersion>7.1</LangVersion>
+    <Configurations>Debug;Release;Prerelease</Configurations>
+    <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SyndicationFeed.ReaderWriter" Version="1.0.2"/>
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\SharedLibraryCore\SharedLibraryCore.csproj" />
+    <PackageReference Include="Microsoft.SyndicationFeed.ReaderWriter" Version="1.0.2" />
+    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2.2.4" PrivateAssets="All" />
   </ItemGroup>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <Exec Command="copy &quot;$(TargetPath)&quot; &quot;$(SolutionDir)BUILD\Plugins&quot;"/>
-    <Exec Command="copy &quot;$(TargetDir)Microsoft.SyndicationFeed.ReaderWriter.dll&quot; &quot;$(SolutionDir)BUILD\Plugins&quot;"/>
+    <Exec Command="dotnet publish $(ProjectPath) -c $(ConfigurationName) -o $(ProjectDir)..\..\Build\Plugins --no-build --no-restore --no-dependencies" />
   </Target>
 
 </Project>

Plugins/AutomessageFeed/Plugin.cs

@@ -79,7 +79,7 @@ namespace AutomessageFeed
 
         public Task OnUnloadAsync()
         {
-            throw new NotImplementedException();
+            return Task.CompletedTask;
         }
     }
 }

Plugins/IW4ScriptCommands/Commands/Balance.cs

@@ -1,6 +1,6 @@
-using SharedLibraryCore;
+/*
+using SharedLibraryCore;
 using SharedLibraryCore.Database.Models;
-using SharedLibraryCore.Objects;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -198,3 +198,4 @@ namespace IW4ScriptCommands.Commands
         }
     }
 }
+*/

Plugins/IW4ScriptCommands/GscApiController.cs

@@ -1,7 +1,6 @@
-using IW4ScriptCommands.Commands;
+/*using IW4ScriptCommands.Commands;
 using Microsoft.AspNetCore.Mvc;
 using SharedLibraryCore;
-using SharedLibraryCore.Objects;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -17,7 +16,7 @@ namespace WebfrontCore.Controllers.API
         public IActionResult ClientInfo(string networkId)
         {
             var clientInfo = Manager.GetActiveClients()
-                .FirstOrDefault(c => c.NetworkId == networkId.ConvertLong());
+                .FirstOrDefault(c => c.NetworkId == networkId.ConvertGuidToLong());
 
             if (clientInfo != null)
             {
@@ -40,7 +39,7 @@ namespace WebfrontCore.Controllers.API
             return Unauthorized();
 
             var client = Manager.GetActiveClients()
-                .FirstOrDefault(c => c.NetworkId == networkId.ConvertLong());
+                .FirstOrDefault(c => c.NetworkId == networkId.ConvertGuidToLong());
 
             var server = Manager.GetServers().First(c => c.EndPoint == serverId);
 
@@ -52,3 +51,4 @@ namespace WebfrontCore.Controllers.API
         }
     }
 }
+*/

Plugins/IW4ScriptCommands/IW4ScriptCommands.csproj

@@ -2,24 +2,20 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
-    <RuntimeFrameworkVersion>2.2.2</RuntimeFrameworkVersion>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <ApplicationIcon />
     <StartupObject />
     <Configurations>Debug;Release;Prerelease</Configurations>
+    <LangVersion>7.1</LangVersion>
   </PropertyGroup>
 
-  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <Exec Command="copy &quot;$(TargetPath)&quot; &quot;$(SolutionDir)BUILD\Plugins&quot;" />
-  </Target>
-
   <ItemGroup>
-    <ProjectReference Include="..\..\SharedLibraryCore\SharedLibraryCore.csproj" />
-    <ProjectReference Include="..\Stats\Stats.csproj" />
+    <ProjectReference Include="..\..\SharedLibraryCore\SharedLibraryCore.csproj">
+      <Private>false</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\Stats\Stats.csproj">
+      <Private>false</Private>
+    </ProjectReference>
   </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Update="Microsoft.NETCore.App" Version="2.2.2" />
-  </ItemGroup>
-
+  
 </Project>

Plugins/IW4ScriptCommands/Plugin.cs

@@ -1,4 +1,4 @@
-using SharedLibraryCore;
+/*using SharedLibraryCore;
 using SharedLibraryCore.Interfaces;
 using System;
 using System.Collections.Generic;
@@ -47,3 +47,4 @@ namespace IW4ScriptCommands
         public Task OnUnloadAsync() => Task.CompletedTask;
     }
 }
+*/

Plugins/LiveRadar/Configuration/LiveRadarConfiguration.cs

@@ -0,0 +1,391 @@
+using SharedLibraryCore.Interfaces;
+using System.Collections.Generic;
+
+namespace LiveRadar.Configuration
+{
+    class LiveRadarConfiguration : IBaseConfiguration
+    {
+        public List<MapInfo> Maps { get; set; }
+
+        public IBaseConfiguration Generate()
+        {
+            Maps = new List<MapInfo>()
+            {
+                new MapInfo()
+                {
+                    Name = "mp_afghan",
+                    MaxLeft = 4600, // ymax
+                    MaxRight = -1100, // ymin
+                    MaxBottom = -1400, // xmin
+                    MaxTop = 4600, // xmax
+                    Left = 52, // pxmin
+                    Right = 898, // pxmax
+                    Bottom = 930, // pymax
+                    Top = 44 // pymin
+                },
+
+                new MapInfo()
+                {
+                    Name = "mp_rust",
+                    Top = 212,
+                    Bottom = 812,
+                    Left = 314,
+                    Right = 856,
+                    MaxRight = -225,
+                    MaxLeft = 1809,
+                    MaxTop = 1773,
+                    MaxBottom = -469
+                },
+
+                new MapInfo()
+                {
+                    Name = "mp_terminal",
+                    Top = 174,
+                    Bottom = 846,
+                    Left = 18,
+                    Right = 1011,
+                    MaxTop = 2929,
+                    MaxBottom = -513,
+                    MaxLeft = 7521,
+                    MaxRight = 2447
+                },
+
+                new MapInfo()
+                {
+                    Name = "mp_subbase",
+                    MaxLeft =  1841,
+                    MaxRight =  -3817,
+                    MaxBottom =  -1585,
+                    MaxTop =  2593,
+                    Left =  18,
+                    Right =  968,
+                    Bottom =  864,
+                    Top =  160,
+                    ViewPositionRotation = 180,
+                },
+
+                new MapInfo()
+                {
+                    Name = "mp_estate",
+                    Top = 52,
+                    Bottom = 999,
+                    Left = 173,
+                    Right = 942,
+                    MaxTop = 2103,
+                    MaxBottom = -5077,
+                    MaxLeft = 4437,
+                    MaxRight = -1240,
+                    Rotation = 143,
+                    CenterX = -1440,
+                    CenterY = 1920,
+                    Scaler = 0.85f,
+                    ViewPositionRotation = 180
+                },
+
+                new  MapInfo()
+                {
+                    Name = "mp_highrise",
+                    MaxBottom = -3909,
+                    MaxTop =  1649,
+                    MaxRight = 5111,
+                    MaxLeft = 8906,
+                    Left =  108,
+                    Right =  722,
+                    Top = 66,
+                    Bottom = 974,
+                },
+
+                new MapInfo()
+                {
+                    Name = "mp_quarry",
+                    MaxBottom =  -5905,
+                    MaxTop =  -1423,
+                    MaxRight = -2095,
+                    MaxLeft = 3217,
+                    Left =  126,
+                    Right =  968,
+                    Top = 114,
+                    Bottom = 824
+                },
+
+                new MapInfo()
+                {
+                    Name = "mp_boneyard",
+                    MaxBottom =  -1756,
+                    MaxTop =  2345,
+                    MaxRight = -715,
+                    MaxLeft = 1664,
+                    Left =  248,
+                    Right =  728,
+                    Top = 68,
+                    Bottom = 897
+                },
+
+                new MapInfo()
+                {
+                    Name = "mp_brecourt",
+                    MaxBottom =  -3797,
+                    MaxTop =  4240,
+                    MaxRight = -3876,
+                    MaxLeft = 2575,
+                    Left =  240,
+                    Right =  846,
+                    Top = 180,
+                    Bottom = 934
+                },
+
+                new MapInfo()
+                {
+                    Name = "mp_checkpoint",
+                    MaxBottom =  -2273,
+                    MaxTop =  2153,
+                    MaxRight = -3457,
+                    MaxLeft = 2329,
+                    Left =  30,
+                    Right =  1010,
+                    Top = 136,
+                    Bottom = 890
+                },
+
+                new MapInfo()
+                {
+                    Name = "mp_derail",
+                    MaxBottom =  -2775,
+                    MaxTop =  3886,
+                    MaxRight = -3807,
+                    MaxLeft = 4490,
+                    Left =  130,
+                    Right =  892,
+                    Top = 210,
+                    Bottom = 829
+                },
+
+                new MapInfo()
+                {
+                    Name = "mp_favela",
+                    MaxBottom =  -2017,
+                    MaxTop =  1769,
+                    MaxRight = -1239,
+                    MaxLeft = 2998,
+                    Left =  120,
+                    Right =  912,
+                    Top = 174,
+                    Bottom = 878
+                },
+
+                new MapInfo()
+                {
+                    Name = "mp_invasion",
+                    MaxBottom =  -3673,
+                    MaxTop =  2540,
+                    MaxRight = -3835,
+                    MaxLeft = 980,
+                    Left =  20,
+                    Right =  808,
+                    Top = 0,
+                    Bottom = 1006
+                },
+
+                new MapInfo()
+                {
+                    Name = "mp_nightshift",
+                    MaxBottom =  -2497,
+                    MaxTop =  1977,
+                    MaxRight = -2265,
+                    MaxLeft = 945,
+                    Left =  246,
+                    Right = 826,
+                    Top = 104,
+                    Bottom = 916
+                },
+
+                new MapInfo()
+                {
+                    Name = "mp_rundown",
+                    MaxBottom = -2304,
+                    MaxTop =  3194,
+                    MaxRight = -3558,
+                    MaxLeft = 3361,
+                    Left =  32,
+                    Right =  1030,
+                    Top = 96,
+                    Bottom = 892
+                },
+
+                new MapInfo()
+                {
+                    Name = "mp_underpass",
+                    MaxBottom =  -601,
+                    MaxTop =  3761,
+                    MaxRight = -1569,
+                    MaxLeft = 3615,
+                    Left =  42,
+                    Right =  978,
+                    Top = 157,
+                    Bottom = 944
+                },
+
+                new MapInfo()
+                {
+                    Name = "mp_abandon",
+                    MaxBottom = -1290,
+                    MaxTop =    3855,
+                    MaxRight =  -2907,
+                    MaxLeft =   2723,
+                    Left =  6,
+                    Right = 1016,
+                    Top =   32,
+                    Bottom =    945
+                },
+
+                new MapInfo()
+                {
+                    Name = "mp_compact",
+                    MaxBottom = 0,
+                    MaxTop =    4264,
+                    MaxRight =  -1552,
+                    MaxLeft =   3344,
+                    Left =  35,
+                    Right = 1003,
+                    Top =   94,
+                    Bottom =    935
+                },
+
+                new MapInfo()
+                {
+                    Name = "mp_complex",
+                    MaxBottom = -2869,
+                    MaxTop =    2867,
+                    MaxRight =  -4204,
+                    MaxLeft =   -1218,
+                    Left =  282,
+                    Right = 749,
+                    Top =  48,
+                    Bottom =    991
+                },
+
+
+                new MapInfo()
+                {
+                    Name = "mp_crash",
+                    MaxBottom = -953,
+                    MaxTop =    1811,
+                    MaxRight =  -2129,
+                    MaxLeft =   2277,
+                    Left =  52,
+                    Right = 1017,
+                    Top =   201,
+                    Bottom =    807
+                },
+
+                new MapInfo()
+                {
+                    Name = "mp_fuel2",
+                    MaxBottom = -2218,
+                    MaxTop =    4324,
+                    MaxRight =  -3115,
+                    MaxLeft =   3193,
+                    Left =  39,
+                    Right = 888,
+                    Top =   24,
+                    Bottom =    906
+                },
+
+                new MapInfo()
+                {
+                    Name = "mp_overgrown",
+                    MaxBottom = -2052,
+                    MaxTop =    3236,
+                    MaxRight =  -5393,
+                    MaxLeft =   808,
+                    Left =  17,
+                    Right = 1024,
+                    Top =   0,
+                    Bottom =    847
+                },
+
+                new MapInfo()
+                {
+                    Name = "mp_storm",
+                    MaxBottom = -2317,
+                    MaxTop =    2537,
+                    MaxRight =  -2223,
+                    MaxLeft =   2097,
+                    Left =  79,
+                    Right = 932,
+                    Top =   20,
+                    Bottom =    995
+                },
+
+                new MapInfo()
+                {
+                    Name = "mp_strike",
+                    MaxBottom = -2504,
+                    MaxTop =    3359,
+                    MaxRight =  -3105,
+                    MaxLeft =   2822,
+                    Left =  40,
+                    Right = 969,
+                    Top =   36,
+                    Bottom =    955
+                },
+
+                new MapInfo()
+                {
+                    Name = "mp_trailerpark",
+                    MaxBottom = -2709,
+                    MaxTop =    2027,
+                    MaxRight =  -1719,
+                    MaxLeft =   1666,
+                    Left =  152,
+                    Right = 785,
+                    Top =   50,
+                    Bottom =    931
+                },
+
+                new MapInfo()
+                {
+                    Name = "mp_vacant",
+                    MaxBottom = -2089,
+                    MaxTop =    1652,
+                    MaxRight =  -1393,
+                    MaxLeft =   1789,
+                    Left =  122,
+                    Right = 909,
+                    Top =   16,
+                    Bottom =    951
+                },
+
+                new MapInfo()
+                {
+                    Name = "mp_nuked",
+                    MaxLeft = 1211,
+                    MaxRight = -557,
+                    MaxBottom = -2110,
+                    MaxTop = 2092,
+                    Left = 340,
+                    Right = 698,
+                    Bottom = 930, 
+                    Top = 92 
+                },
+
+                new MapInfo()
+                {
+                    Name = "mp_killhouse",
+                    MaxLeft = 4276,
+                    MaxRight = 2973,
+                    MaxBottom = -1164,
+                    MaxTop = 1392,
+                    Left = 319,
+                    Right = 758,
+                    Bottom = 937,
+                    Top = 87
+                }
+            };
+
+            return this;
+        }
+
+        public string Name() => "LiveRadar";
+    }
+}

Plugins/LiveRadar/Controllers/RadarController.cs

@@ -0,0 +1,86 @@
+using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json;
+using SharedLibraryCore;
+using SharedLibraryCore.Dtos;
+using SharedLibraryCore.Interfaces;
+using System.Linq;
+
+namespace LiveRadar.Web.Controllers
+{
+    public class RadarController : BaseController
+    {
+        private static readonly JsonSerializerSettings _serializerSettings = new JsonSerializerSettings()
+        {
+            ReferenceLoopHandling = ReferenceLoopHandling.Ignore,
+            ContractResolver = new Newtonsoft.Json.Serialization.CamelCasePropertyNamesContractResolver()
+        };
+
+        private readonly IManager _manager;
+
+        public RadarController(IManager manager) : base(manager)
+        {
+            _manager = manager;
+        }
+
+        [HttpGet]
+        [Route("Radar/{serverId}")]
+        public IActionResult Index(long? serverId = null)
+        {
+            ViewBag.IsFluid = true;
+            ViewBag.Title = Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_RADAR_TITLE"];
+            ViewBag.ActiveServerId = serverId ?? _manager.GetServers().FirstOrDefault()?.EndPoint;
+            ViewBag.Servers = _manager.GetServers()
+                .Where(_server => _server.GameName == Server.Game.IW4)
+                .Select(_server => new ServerInfo()
+                {
+                    Name = _server.Hostname,
+                    ID = _server.EndPoint
+                });
+
+            return View();
+        }
+
+        [HttpGet]
+        [Route("Radar/{serverId}/Map")]
+        public IActionResult Map(long? serverId = null)
+        {
+            var server = serverId == null ? _manager.GetServers().FirstOrDefault() : _manager.GetServers().FirstOrDefault(_server => _server.EndPoint == serverId);
+            var map = Plugin.Config.Configuration().Maps.FirstOrDefault(_map => _map.Name == server.CurrentMap.Name);
+
+            if (map != null)
+            {
+                map.Alias = server.CurrentMap.Alias;
+                return Json(map);
+            }
+
+            // occurs if we don't recognize the map
+            return StatusCode(500);
+        }
+
+        [HttpGet]
+        [Route("Radar/{serverId}/Data")]
+        [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
+        public IActionResult Data(long? serverId = null)
+        {
+            var server = serverId == null ? _manager.GetServers()[0] : _manager.GetServers().First(_server => _server.EndPoint == serverId);
+            var radarInfo = server.GetClientsAsList().Select(_client => _client.GetAdditionalProperty<RadarEvent>("LiveRadar")).ToList();
+            return Json(radarInfo);
+        }
+
+        [HttpGet]
+        [Route("Radar/Update")]
+        public IActionResult Update(string payload)
+        {
+            var radarUpdate = RadarEvent.Parse(payload);
+            var client = _manager.GetActiveClients().FirstOrDefault(_client => _client.NetworkId == radarUpdate.Guid);
+
+            if (client != null)
+            {
+                radarUpdate.Name = client.Name.StripColors();
+                client.SetAdditionalProperty("LiveRadar", radarUpdate);
+            }
+
+            return Ok();
+        }
+    }
+}

Plugins/LiveRadar/LiveRadar.csproj

@@ -0,0 +1,32 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <RazorCompileOnBuild Condition="'$(CONFIG)'!='Debug'">true</RazorCompileOnBuild>
+    <RazorCompiledOnPublish Condition="'$(CONFIG)'!='Debug'">true</RazorCompiledOnPublish>
+    <PreserveCompilationContext Condition="'$(CONFIG)'!='Debug'">false</PreserveCompilationContext>
+    <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
+    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
+    <Version>0.1.0.0</Version>
+    <Configurations>Debug;Release;Prerelease</Configurations>
+    <LangVersion>7.1</LangVersion>
+    <ApplicationIcon />
+    <OutputType>Library</OutputType>
+    <StartupObject />
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="RaidMax.IW4MAdmin.SharedLibraryCore" Version="2.2.4" PrivateAssets="All" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Update="Views\_ViewImports.cshtml">
+      <CopyToPublishDirectory>Never</CopyToPublishDirectory>
+    </Content>
+  </ItemGroup>
+
+  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
+    <Exec Command="dotnet publish $(ProjectPath) -c $(ConfigurationName) -o $(ProjectDir)..\..\Build\Plugins --no-build --no-restore --no-dependencies" />
+  </Target>
+
+</Project>

Plugins/LiveRadar/MapInfo.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace LiveRadar
+{
+    public class MapInfo
+    {
+        public string Name { get; set; }
+        public string Alias { get; set; }
+        // distance from the edge of the minimap image
+        // to the "playable" area
+        public int Top { get; set; }
+        public int Bottom { get; set; }
+        public int Left { get; set; }
+        public int Right { get; set; }
+        // maximum coordinate values for the map
+        public int MaxTop { get; set; }
+        public int MaxBottom { get; set; }
+        public int MaxLeft { get; set; }
+        public int MaxRight { get; set; }
+        public float Rotation { get; set; }
+        public float ViewPositionRotation { get; set; }
+        public float CenterX { get; set; }
+        public float CenterY { get; set; }
+        public float Scaler { get; set; } = 1.0f;
+
+        public int Width => MaxLeft - MaxRight;
+        public int Height => MaxTop - MaxBottom;
+    }
+}

Plugins/LiveRadar/Plugin.cs

@@ -0,0 +1,73 @@
+using LiveRadar.Configuration;
+using SharedLibraryCore;
+using SharedLibraryCore.Configuration;
+using SharedLibraryCore.Interfaces;
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace LiveRadar
+{
+    public class Plugin : IPlugin
+    {
+        public string Name => "Live Radar";
+
+        public float Version => (float)Utilities.GetVersionAsDouble();
+
+        public string Author => "RaidMax";
+
+        internal static BaseConfigurationHandler<LiveRadarConfiguration> Config;
+
+        public Task OnEventAsync(GameEvent E, Server S)
+        {
+            if (E.Type == GameEvent.EventType.Unknown)
+            {
+                if (E.Data?.StartsWith("LiveRadar") ?? false)
+                {
+                    try
+                    {
+                        var radarUpdate = RadarEvent.Parse(E.Data);
+                        var client = S.Manager.GetActiveClients().FirstOrDefault(_client => _client.NetworkId == radarUpdate.Guid);
+
+                        if (client != null)
+                        {
+                            radarUpdate.Name = client.Name.StripColors();
+                            client.SetAdditionalProperty("LiveRadar", radarUpdate);
+                        }
+                    }
+
+                    catch(Exception e)
+                    {
+                        S.Logger.WriteWarning($"Could not parse live radar output: {e.Data}");
+                        S.Logger.WriteDebug(e.GetExceptionInfo());
+                    }
+                }
+            }
+
+            return Task.CompletedTask;
+        }
+
+        public async Task OnLoadAsync(IManager manager)
+        {
+            // load custom configuration
+            Config = new BaseConfigurationHandler<LiveRadarConfiguration>("LiveRadarConfiguration");
+            if (Config.Configuration() == null)
+            {
+                Config.Set((LiveRadarConfiguration)new LiveRadarConfiguration().Generate());
+                await Config.Save();
+            }
+
+            manager.GetPageList().Pages.Add(Utilities.CurrentLocalization.LocalizationIndex["WEBFRONT_RADAR_TITLE"], "/Radar/All");
+        }
+
+        public Task OnTickAsync(Server S)
+        {
+            return Task.CompletedTask;
+        }
+
+        public Task OnUnloadAsync()
+        {
+            return Task.CompletedTask;
+        }
+    }
+}

Plugins/LiveRadar/RadarEvent.cs

@@ -0,0 +1,64 @@
+using SharedLibraryCore;
+using SharedLibraryCore.Helpers;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace LiveRadar
+{
+    public class RadarEvent
+    {
+        public string Name { get; set; }
+        public long Guid { get; set; }
+        public Vector3 Location { get; set; }
+        public Vector3 ViewAngles { get; set; }
+        public string Team { get; set; }
+        public int Kills { get; set; }
+        public int Deaths { get; set; }
+        public int Score { get; set; }
+        public int PlayTime { get; set; }
+        public string Weapon { get; set; }
+        public int Health { get; set; }
+        public bool IsAlive { get; set; }
+        public Vector3 RadianAngles => new Vector3(ViewAngles.X.ToRadians(), ViewAngles.Y.ToRadians(), ViewAngles.Z.ToRadians());
+        public int Id => GetHashCode();
+
+        public override bool Equals(object obj)
+        {
+            if (obj is RadarEvent re)
+            {
+                return re.ViewAngles.X == ViewAngles.X &&
+                    re.ViewAngles.Y == ViewAngles.Y &&
+                    re.ViewAngles.Z == ViewAngles.Z &&
+                    re.Location.X == Location.X &&
+                    re.Location.Y == Location.Y &&
+                    re.Location.Z == Location.Z;
+            }
+
+            return false;
+        }
+
+        public static RadarEvent Parse(string input)
+        {
+            var items = input.Split(';').Skip(1).ToList();
+
+            var parsedEvent = new RadarEvent()
+            {
+                Guid = items[0].ConvertGuidToLong(),
+                Location = Vector3.Parse(items[1]),
+                ViewAngles = Vector3.Parse(items[2]).FixIW4Angles(),
+                Team = items[3],
+                Kills = int.Parse(items[4]),
+                Deaths = int.Parse(items[5]),
+                Score = int.Parse(items[6]),
+                Weapon = items[7],
+                Health = int.Parse(items[8]),
+                IsAlive = items[9] == "1",
+                PlayTime = Convert.ToInt32(items[10])
+            };
+
+            return parsedEvent;
+        }
+    }
+}

Plugins/LiveRadar/Views/Radar/Index.cshtml

@@ -0,0 +1,470 @@
+@model IEnumerable<long>
+
+<style>
+    .progress {
+        border-radius: 0 !important;
+    }
+
+    .player-stat-icon {
+        height: 1.5rem;
+        width: 1.5rem;
+        background-size: 1.5rem 1.5rem;
+    }
+</style>
+<div class="row p-0 ml-auto mr-auto mb-4">
+    <div class="col-12 col-xl-10 p-0 ml-auto mr-auto p-0 pl-lg-3 pr-lg-3 ">
+        <ul class="nav nav-tabs border-top border-bottom nav-fill" role="tablist">
+            @foreach (SharedLibraryCore.Dtos.ServerInfo server in ViewBag.Servers)
+            {
+                <li class="nav-item">
+                    <a asp-controller="Radar" asp-action="Index" asp-route-serverId="@server.ID" class="nav-link @(server.ID == ViewBag.ActiveServerId ? "active": "")" aria-selected="@(server.ID == ViewBag.ActiveServerId ? "true": "false")"><color-code value="@server.Name" allow="@ViewBag.EnableColorCodes"></color-code></a>
+                </li>
+            }
+        </ul>
+    </div>
+</div>
+
+<div class="row p-0 ml-auto mr-auto col-12 col-xl-10">
+    <div class="p-0 pl-lg-3 pr-lg-3 m-0 col-lg-3 col-12 text-lg-right text-center player-data-left" style="opacity: 0;">
+    </div>
+    <div class="pl-0 pr-0 pl-lg-3 pr-lg-3 col-lg-6 col-12 pb-4">
+        <div id="map_name" class="h4 text-center pb-2 pt-2 mb-0 bg-primary">&mdash;</div>
+        <div id="map_list" style="background-size:cover; padding-bottom: 100% !important;">
+            <canvas id="map_canvas" style="position:absolute;"></canvas>
+        </div>
+    </div>
+
+    <div class="p-0 pl-lg-3 pr-lg-3 m-0 col-lg-3 col-12 text-lg-left text-center player-data-right" style="opacity: 0;">
+    </div>
+</div>
+
+<!-- images used by canvas -->
+<img class="hide" id="hud_death" src="~/images/radar/death.png" />
+
+
+@section scripts {
+
+    <script defer="defer">
+        const textOffset = 15;
+        let previousRadarData = undefined;
+        let newRadarData = undefined;
+
+        /************************
+         *          IW4         *
+         * **********************/
+        const weapons = {};
+        weapons["ak47"] = "ak47";
+        weapons["ak47classic"] = "icon_ak47_classic";
+        weapons["ak74u"] = "akd74u";
+        weapons["m16"] = "m16a4";
+        weapons["m4"] = "m4carbine";
+        weapons["fn2000"] = "fn2000";
+        weapons["masada"] = "masada";
+        weapons["famas"] = "famas";
+        weapons["fal"] = "fnfal";
+        weapons["scar"] = "scar_h";
+        weapons["tavor"] = "tavor";
+
+        weapons["mp5k"] = "mp5k";
+        weapons["uzi"] = "mini_uzi";
+        weapons["p90"] = "p90";
+        weapons["kriss"] = "kriss";
+        weapons["ump45"] = "ump45";
+
+        weapons["rpd"] = "rpd";
+        weapons["sa80"] = "sa80_lmg";
+        weapons["mg4"] = "mg4";
+        weapons["m240"] = "m240";
+        weapons["aug"] = "steyr";
+
+        weapons["barrett"] = "barrett50cal";
+        weapons["wa2000"] = "wa2000";
+        weapons["m21"] = "m14ebr";
+        weapons["cheytac"] = "cheytac";
+        weapons["dragunov"] = "hud_dragunovsvd";
+
+        weapons["beretta"] = "m9beretta";
+        weapons["usp"] = "usp_45";
+        weapons["deserteagle"] = "desert_eagle";
+        weapons["deserteaglegold"] = "desert_eagle_gold";
+        weapons["desert"]
+        weapons["coltanaconda"] = "colt_anaconda";
+
+        weapons["tmp"] = "mp9";
+        weapons["glock"] = "glock";
+        weapons["beretta393"] = "beretta393";
+        weapons["pp2000"] = "pp2000";
+
+        weapons["ranger"] = "sawed_off";
+        weapons["model1887"] = "model1887";
+        weapons["striker"] = "striker";
+        weapons["aa12"] = "aa12";
+        weapons["m1014"] = "benelli_m4";
+        weapons["spas12"] = "spas12";
+
+        weapons["m79"] = "m79";
+        weapons["rpg"] = "rpg";
+        weapons["at4"] = "at4";
+        weapons["stinger"] = "stinger";
+        weapons["javelin"] = "javelin";
+
+        weapons["m40a3"] = "m40a3";
+        weapons["none"] = "neutral";
+        weapons["riotshield"] = "riot_shield";
+        weapons["peacekeeper"] = "peacekeeper";
+
+        function drawCircle(context, x, y, color) {
+            context.beginPath();
+            context.arc(x, y, 6 * stateInfo.imageScaler, 0, 2 * Math.PI, false);
+            context.fillStyle = color;
+            context.fill();
+            context.lineWidth = 0.5;
+            context.strokeStyle = 'rgba(255, 255, 255, 0.5)';
+            context.closePath();
+            context.stroke();
+        }
+
+        function drawLine(context, x1, y1, x2, y2, color) {
+            context.beginPath();
+            context.lineWidth = '3';
+            context.moveTo(x1, y1);
+            context.lineTo(x2, y2);
+            context.closePath();
+            context.stroke();
+        }
+
+        function drawTriangle(context, v1, v2, v3, color) {
+            context.beginPath();
+            context.moveTo(v1.x, v1.y);
+            context.lineTo(v2.x, v2.y);
+            context.lineTo(v3.x, v3.y);
+            context.closePath();
+            context.fillStyle = color;
+            context.fill();
+        }
+
+        function drawText(context, x, y, text, size, fillColor, strokeColor, alignment = 'left') {
+            context.beginPath();
+            context.save();
+            context.font = `bold ${Math.max(12, size * stateInfo.imageScaler)}px courier new`;
+            context.fillStyle = fillColor;
+            context.shadowColor = strokeColor;
+            context.shadowBlur = 4;
+            context.textAlign = alignment;
+            context.fillText(text, x, y);
+            context.restore();
+            context.closePath();
+        }
+
+        function drawImage(context, imgSelector, x, y, alpha = 1) {
+            context.save();
+            context.globalAlpha = alpha;
+            context.drawImage(document.getElementById(imgSelector), x - (15 * stateInfo.imageScaler), y - (15 * stateInfo.imageScaler), 32 * stateInfo.imageScaler, 32 * stateInfo.imageScaler);
+            context.globalAlpha = 1;
+            context.restore();
+        }
+
+        function checkCanvasSize(canvas, context, minimap, map) {
+
+            let width = Math.round(minimap.width());
+            if (Math.round(context.canvas.width) != width) {
+
+                canvas.width(width);
+                canvas.height(width);
+
+                context.canvas.height = width;
+                context.canvas.width = context.canvas.height;
+            }
+
+            stateInfo.imageScaler = (stateInfo.canvas.width() / 1024)
+            stateInfo.mapScalerX = (((stateInfo.mapInfo.right * stateInfo.imageScaler) - (stateInfo.mapInfo.left * stateInfo.imageScaler)) / stateInfo.mapInfo.width);
+            stateInfo.mapScalerY = (((stateInfo.mapInfo.bottom * stateInfo.imageScaler) - (stateInfo.mapInfo.top * stateInfo.imageScaler)) / stateInfo.mapInfo.height);
+            stateInfo.mapScaler = (stateInfo.mapScalerX + stateInfo.mapScalerY) / 2
+
+            stateInfo.forwardDistance = 500.0;
+            stateInfo.fovWidth = 40;
+        }
+
+        function calculateViewPosition(x, y, distance) {
+            let nx = Math.cos(x) * Math.cos(y);
+            let ny = Math.sin(x) * Math.cos(y);
+            let nz = Math.sin(360.0 - y);
+
+            return { x: (nx * distance) * stateInfo.mapScaler, y: (ny * distance) * stateInfo.mapScaler, z: (nz * distance)  * stateInfo.mapScaler };
+        }
+
+        function lerp(start, end, complete) {
+            return (1 - complete) * start + complete * end;
+        }
+
+        function easeLerp(start, end, t) {
+            let t2 = (1 - Math.cos(t * Math.PI)) / 2;
+
+            return (start * (1-t2) + end * t2);
+        }
+
+        function fixRollAngles(oldAngles, newAngles) {
+            let newX = newAngles.x;
+            let newY = newAngles.y;
+
+            let angleDifferenceX = (oldAngles.x - newAngles.x);
+
+            if (angleDifferenceX > Math.PI) {
+                newX = oldAngles.x + (Math.PI * 2) - angleDifferenceX;
+            }
+
+            else if (Math.abs(newAngles.x - oldAngles.x) > Math.PI) {
+                newX = newAngles.x - (Math.PI * 2);
+            }
+
+            let angleDifferenceY = (oldAngles.y - newAngles.y);
+
+            if (angleDifferenceY > Math.PI) {
+                newY = oldAngles.y + (Math.PI * 2) - angleDifferenceY;
+            }
+
+            else if (Math.abs(newAngles.y - oldAngles.y) > Math.PI) {
+                newY = newAngles.y - (Math.PI * 2);
+            }
+
+            return { x: newX, y: newY };
+        }
+
+        function toRadians(deg) {
+            return deg * Math.PI / 180.0;
+        }
+
+        function rotate(cx, cy, x, y, angle) {
+            var radians = (Math.PI / 180) * angle,
+            cos = Math.cos(radians),
+            sin = Math.sin(radians),
+            nx = (cos * (x - cx)) + (sin * (y - cy)) + cx,
+            ny = (cos * (y - cy)) - (sin * (x - cx)) + cy;
+            return {
+                x: nx,
+                y: ny
+            };
+        }
+
+        function weaponImageForWeapon(weapon) {
+            let name = weapon.split('_')[0];
+            if (weapons[name] == undefined) {
+                console.log(name);
+                name = "none";
+            }
+
+            return `../images/radar/hud_weapons/hud_${weapons[name]}.png`;
+        }
+
+        function updatePlayerData() {
+            $('.player-data-left').html('');
+            $('.player-data-right').html('');
+
+            $.each(newRadarData, function (index, player) {
+                if (player == null) {
+                    return;
+                }
+
+                let column = index % 2 == 0 ? $('.player-data-left') : $('.player-data-right');
+                column.append(`<div class="progress" style="height: 1.5rem; background-color: transparent;">
+                                 <div style="position: absolute; font-size: 1rem; left: 1.5rem;">${player.name}</div>
+                                 <div class="progress-bar bg-success" role="progressbar" style="min-width: 0px; width: ${player.health}%" aria-valuenow="${player.health}" aria-valuemin="0" aria-valuemax="100"></div>
+                                <div class="progress-bar bg-danger" role="progressbar" style="min-width: 0px; border-right: 0px; width: ${100 - player.health}%" aria-valuenow="${100 - player.health}" aria-valuemin="0" aria-valuemax="100"></div>
+                               </div>
+                               <div class="d-flex flex-row flex-wrap p-2 mb-4 bg-dark border-bottom">
+                                 <div style="width: 3rem; height: 1.5rem; background-image:url(${weaponImageForWeapon(player.weapon)}); background-size: 3rem 1.5rem;" class="mr-auto text-left">
+                               </div>
+                                <div class="player-stat-icon" style="background-image:url('/images/radar/kills.png')"></div>
+                                <div class="pr-2">${player.kills}</div>
+                                <div class="player-stat-icon" style="background-image:url('/images/radar/death.png')"></div>
+                                <div class="pr-3">${player.deaths}</div>
+                                <span class="align-self-center oi oi-target pr-1"></span>
+                                <div class="pr-3 ">${player.deaths == 0 ? player.kills.toFixed(2) : (player.kills / player.deaths).toFixed(2)}</div>
+                                <span class="align-self-center oi oi-graph pr-1"></span>
+                                <div>${ player.playTime == 0 ? '&mdash;' : Math.round(player.score / (player.playTime / 60))}</div>
+                              </div>`);
+            });
+
+            $('.player-data-left').delay(1000).animate({opacity: 1}, 500);
+            $('.player-data-right').delay(1000).animate({opacity: 1}, 500);
+        }
+
+        const stateInfo = {
+            canvas: $('#map_canvas'),
+            ctx: $('#map_canvas')[0].getContext('2d'),
+            updateFrequency: 750,
+            updateFrameTimeDeviation: 0,
+            forwardDistance: undefined,
+            fovWidth: undefined,
+            mapInfo: undefined,
+            mapScaler: undefined,
+            deathIcons: {},
+            deathIconTime: 4000
+        };
+
+        function updateRadarData() {
+            $.getJSON('@Url.Action("Data", "Radar", new { serverId = ViewBag.ActiveServerId })', function (_radarItem) {
+                newRadarData = _radarItem;
+            });
+
+
+             $.getJSON('@Url.Action("Map", "Radar", new { serverId = ViewBag.ActiveServerId })', function (_map) {
+                 stateInfo.mapInfo = _map
+             });
+
+            $.each(newRadarData, function (index, value) {
+                if (previousRadarData != undefined && index < previousRadarData.length) {
+
+                    let previous = previousRadarData[index];
+
+                    // this happens when the player has first joined and we haven't gotten two snapshots yet
+                    if (value == null) {
+                      return;
+                    }
+
+                    if (previous == null) {
+                        previous = value;
+                    }
+
+                    // we don't want to treat a disconnected player snapshot as the previous
+                    else if (previous.guid == value.guid) {
+                        value.previous = previous;
+                    }
+
+                    // we haven't gotten a new item, it's just the old one again
+                    if (previous.id === value.id) {
+                        value.animationTime = previous.animationTime;
+                        value.previous = value;
+                    }
+
+                    // they died between this snapshot and last so we wanna setup the death icon
+                    if (!value.isAlive && previous.isAlive) {
+                        stateInfo.deathIcons[value.guid] = {
+                            animationTime: now,
+                            location: value.location
+                        };
+                    }
+
+                    // they respawned between this snapshot and last so we don't want to show wherever the were specating from
+                    else if (value.isAlive && !previous.isAlive) {
+                        value.previous = value;
+                    }
+            }});
+
+            // we switch out the items to
+            previousRadarData = newRadarData;
+
+            $('#map_name').html(stateInfo.mapInfo.alias);
+            $('#map_list').css('background-image', `url(../images/radar/minimaps/compass_map_${stateInfo.mapInfo.name}@('@')2x.jpg)`);
+            checkCanvasSize(stateInfo.canvas, stateInfo.ctx, $('#map_list'), stateInfo.mapInfo);
+            updatePlayerData();
+        }
+
+        function updateMap() {
+            let ctx = stateInfo.ctx;
+
+            ctx.clearRect(0, 0, ctx.canvas.width, ctx.canvas.height);
+            now = performance.now();
+
+            $.each(previousRadarData, function (index, value) {
+                if (value == null) {
+                    return;
+                }
+
+                if (value.previous == null) {
+                    value.previous = value;
+                }
+
+                // this indicates we got a new snapshot to work with so we set the time based off the previous
+                // frame deviation to have minimal interpolation skipping
+                if (value.animationTime === undefined) {
+                    value.animationTime = now - stateInfo.updateFrameTimeDeviation;
+                }
+
+                if (!value.isAlive) {
+                    return;
+                }
+
+                const elapsedFrameTime = now - value.animationTime;
+                const completionPercent = elapsedFrameTime / stateInfo.updateFrequency;
+
+                // certain maps like estate have an off center axis of origin, so we need to account for that
+                let rotatedPreviousLocation = rotate(stateInfo.mapInfo.centerX, stateInfo.mapInfo.centerY, value.previous.location.x, value.previous.location.y, stateInfo.mapInfo.rotation);
+                let rotatedCurrentLocation = rotate(stateInfo.mapInfo.centerX, stateInfo.mapInfo.centerY, value.location.x, value.location.y, stateInfo.mapInfo.rotation);
+
+                const startX = ((stateInfo.mapInfo.maxLeft - rotatedPreviousLocation.y) * stateInfo.mapScaler) + (stateInfo.mapInfo.left * stateInfo.imageScaler);
+                const startY = ((stateInfo.mapInfo.maxTop - rotatedPreviousLocation.x) * stateInfo.mapScalerY) + (stateInfo.mapInfo.top * stateInfo.imageScaler);
+
+                const endX = ((stateInfo.mapInfo.maxLeft - rotatedCurrentLocation.y) * stateInfo.mapScaler) + (stateInfo.mapInfo.left * stateInfo.imageScaler);
+                const endY = ((stateInfo.mapInfo.maxTop - rotatedCurrentLocation.x) * stateInfo.mapScalerY) + (stateInfo.mapInfo.top * stateInfo.imageScaler);
+
+                let teamColor = value.team == 'allies' ? 'rgb(0, 122, 204, 1)' : 'rgb(255, 69, 69)';
+                let fovColor = value.team == 'allies' ? 'rgba(0, 122, 204, 0.2)' : 'rgba(255, 69, 69, 0.2)';
+
+                // this takes care of moving past the roll-over point of yaw/pitch (ie 360->0)
+                const rollAngleFix = fixRollAngles(value.previous.radianAngles, value.radianAngles);
+
+                const radianLerpX = lerp(value.previous.radianAngles.x, rollAngleFix.x, completionPercent);
+                const radianLerpY = lerp(value.previous.radianAngles.y, rollAngleFix.y, completionPercent);
+
+                // this is some jankiness to get the fov to point the right direction
+                let firstVertex = calculateViewPosition(toRadians(stateInfo.mapInfo.rotation + stateInfo.mapInfo.viewPositionRotation - 90) - radianLerpX + toRadians(stateInfo.fovWidth), radianLerpY, stateInfo.forwardDistance);
+                let secondVertex = calculateViewPosition(toRadians(stateInfo.mapInfo.rotation + stateInfo.mapInfo.viewPositionRotation - 90) - radianLerpX - toRadians(stateInfo.fovWidth), radianLerpY, stateInfo.forwardDistance);
+
+                let currentX = lerp(startX, endX, completionPercent);
+                let currentY = lerp(startY, endY, completionPercent);
+
+                // we need to calculate the distance from the center of the map so we can scale if necessary
+                let centerX = ((stateInfo.mapInfo.maxLeft - stateInfo.mapInfo.centerY) * stateInfo.mapScaler) + (stateInfo.mapInfo.left * stateInfo.imageScaler);
+                let centerY = ((stateInfo.mapInfo.maxTop - stateInfo.mapInfo.centerX) * stateInfo.mapScaler) + (stateInfo.mapInfo.top * stateInfo.imageScaler);
+
+                // reuse lerp to scale the pixel to map ratio
+                currentX = lerp(centerX, currentX, stateInfo.mapInfo.scaler);
+                currentY = lerp(centerY, currentY, stateInfo.mapInfo.scaler);
+
+                drawCircle(ctx, currentX, currentY, teamColor);
+                drawTriangle(ctx,
+                    { x: currentX, y: currentY },
+                    { x: currentX + firstVertex.x, y: currentY + firstVertex.y },
+                    { x: currentX + secondVertex.x, y: currentY + secondVertex.y },
+                    fovColor);
+                drawText(ctx, currentX, currentY - (textOffset * stateInfo.imageScaler), value.name, 16, 'white', teamColor, 'center')
+            });
+
+            const completedIcons = [];
+
+            for (let key in stateInfo.deathIcons) {
+                const icon = stateInfo.deathIcons[key];
+
+                const x = ((stateInfo.mapInfo.maxLeft - icon.location.y) * stateInfo.mapScaler) + (stateInfo.mapInfo.left * stateInfo.imageScaler);
+                const y = ((stateInfo.mapInfo.maxTop - icon.location.x) * stateInfo.mapScaler) + (stateInfo.mapInfo.top * stateInfo.imageScaler);
+
+                const elapsedFrameTime = now - icon.animationTime;
+                const completionPercent = elapsedFrameTime / stateInfo.deathIconTime;
+                const opacity = easeLerp(1, 0, completionPercent);
+
+                drawImage(stateInfo.ctx, 'hud_death', x, y, opacity);
+
+                if (completionPercent >= 1) {
+                    completedIcons.push(key);
+                }
+            }
+
+            for (let i = 0; i < completedIcons.length; i++) {
+                delete stateInfo.deathIcons[completedIcons[i]];
+            }
+
+            window.requestAnimationFrame(updateMap);
+        }
+
+        $(document).ready(function () {
+             $.getJSON('@Url.Action("Map", "Radar", new { serverId = ViewBag.ActiveServerId })', function (_map) {
+                 stateInfo.mapInfo = _map;
+                 updateRadarData();
+                 setInterval(updateRadarData, stateInfo.updateFrequency);
+                 window.requestAnimationFrame(updateMap);
+             });
+        })
+
+    </script>
+}

Plugins/LiveRadar/Views/_ViewImports.cshtml

@@ -0,0 +1,3 @@
+@using SharedLibraryCore
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+@addTagHelper *, SharedLibraryCore