From 47733b0b22960b37f9414579c73e60f8b7a71969 Mon Sep 17 00:00:00 2001
From: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Date: Thu, 23 Dec 2021 22:13:15 +0100
Subject: [PATCH] Fix adding duplicate player entries upon relogging Fixes
 https://github.com/space-wizards/space-station-14/issues/5882

---
 Content.Server/Database/ServerDbBase.cs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/Content.Server/Database/ServerDbBase.cs b/Content.Server/Database/ServerDbBase.cs
index 8c912e0a04..9b219ba4d8 100644
--- a/Content.Server/Database/ServerDbBase.cs
+++ b/Content.Server/Database/ServerDbBase.cs
@@ -487,7 +487,16 @@ namespace Content.Server.Database
                 .Where(player => playerIds.Contains(player.UserId))
                 .ToListAsync();
 
-            round.Players.AddRange(players);
+            var playerSet = new HashSet<Guid>(round.Players.Select(player => player.UserId));
+            foreach (var player in players)
+            {
+                if (playerSet.Contains(player.UserId))
+                {
+                    continue;
+                }
+
+                round.Players.Add(player);
+            }
 
             await db.DbContext.SaveChangesAsync();
         }