From 9afb7533747375cdcb450e94bfa64cfeec295e25 Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Tue, 28 Mar 2023 05:41:38 +1100
Subject: [PATCH] Use RemCompDeferred for portals (#14896)

---
 Content.Shared/Teleportation/Systems/SharedPortalSystem.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Shared/Teleportation/Systems/SharedPortalSystem.cs b/Content.Shared/Teleportation/Systems/SharedPortalSystem.cs
index 6523ce575e..b24047fcea 100644
--- a/Content.Shared/Teleportation/Systems/SharedPortalSystem.cs
+++ b/Content.Shared/Teleportation/Systems/SharedPortalSystem.cs
@@ -132,7 +132,7 @@ public abstract class SharedPortalSystem : EntitySystem
         // if they came from (not us), remove the timeout
         if (TryComp<PortalTimeoutComponent>(subject, out var timeout) && timeout.EnteredPortal != uid)
         {
-            RemComp<PortalTimeoutComponent>(subject);
+            RemCompDeferred<PortalTimeoutComponent>(subject);
         }
     }
 
-- 
2.51.2