From 56627c1f534f2603e120264be5f7075e1bf41479 Mon Sep 17 00:00:00 2001
From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Date: Thu, 31 Aug 2023 20:46:05 -0400
Subject: [PATCH] Suiciding no longer sends you to The Void (#19710)

---
 Content.Server/GameTicking/Rules/RespawnRuleSystem.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Content.Server/GameTicking/Rules/RespawnRuleSystem.cs b/Content.Server/GameTicking/Rules/RespawnRuleSystem.cs
index 7c54bcddfa..a286808623 100644
--- a/Content.Server/GameTicking/Rules/RespawnRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/RespawnRuleSystem.cs
@@ -41,9 +41,9 @@ public sealed class RespawnRuleSystem : GameRuleSystem<RespawnDeadRuleComponent>
         var query = EntityQueryEnumerator<RespawnTrackerComponent>();
         while (query.MoveNext(out _, out var respawn))
         {
-            respawn.Players.Remove(actor.PlayerSession.UserId);
+            if (respawn.Players.Remove(actor.PlayerSession.UserId))
+                QueueDel(ev.Victim);
         }
-        QueueDel(ev.Victim);
     }
 
     private void OnMobStateChanged(MobStateChangedEvent args)