use correct EFClient return time for ScriptPluginExtensions and provi…

…de IPAddress on game interface data
RaidMax · Jul 13, 2024 · 135fc98 · 135fc98
1 parent ee0b40d
commit 135fc98
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Application/Extensions/ScriptPluginExtensions.cs b/Application/Extensions/ScriptPluginExtensions.cs
@@ -1,8 +1,8 @@
 using System.Collections.Generic;
 using System.Linq;
-using Data.Models.Client;
 using Data.Models.Client.Stats;
 using Microsoft.EntityFrameworkCore;
+using SharedLibraryCore.Database.Models;
 using SharedLibraryCore.Interfaces;
 
 namespace IW4MAdmin.Application.Extensions;
@@ -29,7 +29,7 @@ public static IEnumerable<object> GetClientsStatData(this DbSet<EFClientStatisti
     }
 
     public static EFClient GetClientByNumber(this IGameServer server, int clientNumber) =>
-        server.ConnectedClients.FirstOrDefault(client => client.ClientNumber == clientNumber);
+        server.ConnectedClients.FirstOrDefault(client => client.ClientNumber >= 0 && client.ClientNumber == clientNumber);
 
     public static EFClient GetClientByGuid(this IGameServer server, string clientGuid) =>
         server.ConnectedClients.FirstOrDefault(client => client?.GuidString == clientGuid?.Trim().ToLower());

diff --git a/Plugins/ScriptPlugins/GameInterface.js b/Plugins/ScriptPlugins/GameInterface.js
@@ -262,7 +262,8 @@ const plugin = {
                         clientId: client.clientId,
                         lastConnection: client.timeSinceLastConnectionString,
                         tag: tagMeta?.value ?? '',
-                        performance: clientStats?.performance ?? 200.0
+                        performance: clientStats?.performance ?? 200.0,
+                        ipAddress: client.ipAddressString
                     };
                 }