From 43c4d4af3891592d5012cca68b1d684afaaf3832 Mon Sep 17 00:00:00 2001 From: RaidMax Date: Sat, 4 May 2019 09:17:18 -0500 Subject: [PATCH] force bots to all use the same profile use C# 7.1 for projects --- Application/Application.csproj | 1 + Application/ApplicationManager.cs | 1 - Application/IW4MServer.cs | 2 +- Application/RconParsers/BaseRConParser.cs | 6 ------ Plugins/AutomessageFeed/AutomessageFeed.csproj | 7 ++++--- Plugins/IW4ScriptCommands/IW4ScriptCommands.csproj | 1 + Plugins/Login/Login.csproj | 1 + Plugins/ProfanityDeterment/ProfanityDeterment.csproj | 1 + Plugins/Stats/Stats.csproj | 1 + Plugins/Tests/Tests.csproj | 1 + Plugins/Web/StatsWeb/StatsWeb.csproj | 1 + Plugins/Welcome/Welcome.csproj | 1 + SharedLibraryCore/Objects/EFClient.cs | 2 +- SharedLibraryCore/SharedLibraryCore.csproj | 1 + SharedLibraryCore/Utilities.cs | 4 +--- WebfrontCore/WebfrontCore.csproj | 1 + 16 files changed, 17 insertions(+), 15 deletions(-) diff --git a/Application/Application.csproj b/Application/Application.csproj index d16640a77..c4d3a54df 100644 --- a/Application/Application.csproj +++ b/Application/Application.csproj @@ -34,6 +34,7 @@ true 2.2.7.1 2.2.7.1 + 7.1 diff --git a/Application/ApplicationManager.cs b/Application/ApplicationManager.cs index 5668e1abd..723b5c034 100644 --- a/Application/ApplicationManager.cs +++ b/Application/ApplicationManager.cs @@ -579,7 +579,6 @@ namespace IW4MAdmin.Application } #endregion } - private async Task SendHeartbeat(object state) { var heartbeatState = (HeartbeatState)state; diff --git a/Application/IW4MServer.cs b/Application/IW4MServer.cs index 6f72265a2..e63f836ca 100644 --- a/Application/IW4MServer.cs +++ b/Application/IW4MServer.cs @@ -215,7 +215,7 @@ namespace IW4MAdmin var existingClient = GetClientsAsList().FirstOrDefault(_client => _client.Equals(E.Origin)); // they're already connected - if (existingClient != null) + if (existingClient != null && !E.Origin.IsBot) { Logger.WriteWarning($"detected preconnect for {E.Origin}, but they are already connected"); return false; diff --git a/Application/RconParsers/BaseRConParser.cs b/Application/RconParsers/BaseRConParser.cs index 241033b3f..32535eddb 100644 --- a/Application/RconParsers/BaseRConParser.cs +++ b/Application/RconParsers/BaseRConParser.cs @@ -159,12 +159,6 @@ namespace IW4MAdmin.Application.RconParsers State = EFClient.ClientState.Connecting }; - //// they've not fully connected yet - //if (!client.IsBot && ping == 999) - //{ - // continue; - //} - StatusPlayers.Add(client); } } diff --git a/Plugins/AutomessageFeed/AutomessageFeed.csproj b/Plugins/AutomessageFeed/AutomessageFeed.csproj index 2c5d099a8..07649de56 100644 --- a/Plugins/AutomessageFeed/AutomessageFeed.csproj +++ b/Plugins/AutomessageFeed/AutomessageFeed.csproj @@ -3,10 +3,11 @@ netcoreapp2.2 true + 7.1 - + @@ -14,8 +15,8 @@ - - + + diff --git a/Plugins/IW4ScriptCommands/IW4ScriptCommands.csproj b/Plugins/IW4ScriptCommands/IW4ScriptCommands.csproj index a1add8d07..000ead82c 100644 --- a/Plugins/IW4ScriptCommands/IW4ScriptCommands.csproj +++ b/Plugins/IW4ScriptCommands/IW4ScriptCommands.csproj @@ -7,6 +7,7 @@ Debug;Release;Prerelease + 7.1 diff --git a/Plugins/Login/Login.csproj b/Plugins/Login/Login.csproj index 647aa41d9..ca3cfdcc0 100644 --- a/Plugins/Login/Login.csproj +++ b/Plugins/Login/Login.csproj @@ -11,6 +11,7 @@ Forever None Login Plugin for IW4MAdmin Debug;Release;Prerelease + 7.1 diff --git a/Plugins/ProfanityDeterment/ProfanityDeterment.csproj b/Plugins/ProfanityDeterment/ProfanityDeterment.csproj index 1872099bb..3c65ec079 100644 --- a/Plugins/ProfanityDeterment/ProfanityDeterment.csproj +++ b/Plugins/ProfanityDeterment/ProfanityDeterment.csproj @@ -13,6 +13,7 @@ Warns and kicks players for using profanity 2018 Debug;Release;Prerelease + 7.1 diff --git a/Plugins/Stats/Stats.csproj b/Plugins/Stats/Stats.csproj index 990171fca..5f9a8c4dc 100644 --- a/Plugins/Stats/Stats.csproj +++ b/Plugins/Stats/Stats.csproj @@ -13,6 +13,7 @@ Client Statistics Plugin for IW4MAdmin 2018 Debug;Release;Prerelease + 7.1 diff --git a/Plugins/Tests/Tests.csproj b/Plugins/Tests/Tests.csproj index 33719eda0..872f54352 100644 --- a/Plugins/Tests/Tests.csproj +++ b/Plugins/Tests/Tests.csproj @@ -6,6 +6,7 @@ 2.2.2 + 7.1 diff --git a/Plugins/Web/StatsWeb/StatsWeb.csproj b/Plugins/Web/StatsWeb/StatsWeb.csproj index 86f57f88c..6113d0c51 100644 --- a/Plugins/Web/StatsWeb/StatsWeb.csproj +++ b/Plugins/Web/StatsWeb/StatsWeb.csproj @@ -4,6 +4,7 @@ true true Debug;Release;Prerelease + 7.1 diff --git a/Plugins/Welcome/Welcome.csproj b/Plugins/Welcome/Welcome.csproj index 010bc58ef..bf5a7fb8e 100644 --- a/Plugins/Welcome/Welcome.csproj +++ b/Plugins/Welcome/Welcome.csproj @@ -13,6 +13,7 @@ Welcome plugin for IW4MAdmin welcomes clients to the server 2018 Debug;Release;Prerelease + 7.1 diff --git a/SharedLibraryCore/Objects/EFClient.cs b/SharedLibraryCore/Objects/EFClient.cs index ff2260795..e1203aca6 100644 --- a/SharedLibraryCore/Objects/EFClient.cs +++ b/SharedLibraryCore/Objects/EFClient.cs @@ -730,7 +730,7 @@ namespace SharedLibraryCore.Database.Models public override int GetHashCode() { - return (int)NetworkId; + return IsBot ? ClientNumber : (int)NetworkId; } } } diff --git a/SharedLibraryCore/SharedLibraryCore.csproj b/SharedLibraryCore/SharedLibraryCore.csproj index a2a0aefc7..d703adfa7 100644 --- a/SharedLibraryCore/SharedLibraryCore.csproj +++ b/SharedLibraryCore/SharedLibraryCore.csproj @@ -12,6 +12,7 @@ Forever None Debug;Release;Prerelease false + 7.1 diff --git a/SharedLibraryCore/Utilities.cs b/SharedLibraryCore/Utilities.cs index dab544af7..dfffc0ff5 100644 --- a/SharedLibraryCore/Utilities.cs +++ b/SharedLibraryCore/Utilities.cs @@ -270,7 +270,6 @@ namespace SharedLibraryCore { str = str.Substring(0, Math.Min(str.Length, 16)); var bot = Regex.Match(str, @"bot[0-9]+").Value; - int maxBots = 18; // this is a special case for Plutonium T6 if (str.Length <= 11 && @@ -285,8 +284,7 @@ namespace SharedLibraryCore else if (!string.IsNullOrEmpty(bot)) { - // should set their GUID to the negation of their 1 based index (-1 - -18) - id = -(Convert.ToInt64(bot.Substring(3)) + 1) % maxBots; + id = -1; } if (id == 0) diff --git a/WebfrontCore/WebfrontCore.csproj b/WebfrontCore/WebfrontCore.csproj index 02150747b..7eda424e2 100644 --- a/WebfrontCore/WebfrontCore.csproj +++ b/WebfrontCore/WebfrontCore.csproj @@ -27,6 +27,7 @@ true true + 7.1