From 0b32ca16b57d6ed863cabfc33193b1e4270b37f8 Mon Sep 17 00:00:00 2001
From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Date: Tue, 20 Dec 2022 00:22:14 -0500
Subject: [PATCH] ensure the new research server is always valid (#13101)

---
 Content.Server/Research/Systems/ResearchSystem.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Content.Server/Research/Systems/ResearchSystem.cs b/Content.Server/Research/Systems/ResearchSystem.cs
index 2d21737f84..603a003641 100644
--- a/Content.Server/Research/Systems/ResearchSystem.cs
+++ b/Content.Server/Research/Systems/ResearchSystem.cs
@@ -27,7 +27,9 @@ namespace Content.Server.Research.Systems
 
         private void OnStartup(EntityUid uid, ResearchServerComponent component, ComponentStartup args)
         {
-            component.Id = EntityQuery<ResearchServerComponent>(true).Count();
+            var unusedId = EntityQuery<ResearchServerComponent>(true)
+                .Max(s => s.Id) + 1;
+            component.Id = unusedId;
         }
 
         public ResearchServerComponent? GetServerById(int id)