From 291a03febd7675d6c535e68653b60af0a82f1c24 Mon Sep 17 00:00:00 2001
From: Tayrtahn <tayrtahn@gmail.com>
Date: Sat, 20 Apr 2024 17:55:43 -0400
Subject: [PATCH] Possible fix for evac shuttle test failures (#27175)

It couldn't be this easy, could it?

(cherry picked from commit f253067a6927f624002e5a20861abd69b2f388aa)
---
 Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
index 2a68f7a1be..f0256aa15b 100644
--- a/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
+++ b/Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
@@ -416,6 +416,7 @@ public sealed partial class EmergencyShuttleSystem : EntitySystem
             }
 
             component.MapEntity = otherComp.MapEntity;
+            component.Entity = otherComp.Entity;
             component.ShuttleIndex = otherComp.ShuttleIndex;
             return;
         }