diff --git a/Application/Application.csproj b/Application/Application.csproj
index d16640a7..c4d3a54d 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 5668e1ab..723b5c03 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 6f72265a..e63f836c 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 241033b3..32535edd 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 2c5d099a..07649de5 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 a1add8d0..000ead82 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 647aa41d..ca3cfdcc 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 1872099b..3c65ec07 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 990171fc..5f9a8c4d 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 33719eda..872f5435 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 86f57f88..6113d0c5 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 010bc58e..bf5a7fb8 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 ff226079..e1203aca 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 a2a0aefc..d703adfa 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 dab544af..dfffc0ff 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 02150747..7eda424e 100644
--- a/WebfrontCore/WebfrontCore.csproj
+++ b/WebfrontCore/WebfrontCore.csproj
@@ -27,6 +27,7 @@
true
true
+ 7.1