Fix Burrowed Larva not appearing on end card (RMC-14#5064)

MACMAN2003 · Dec 6, 2024 · a6c2401 · a6c2401
1 parent 3278288
commit a6c2401
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/Content.Shared/_RMC14/Xenonids/Hive/SharedXenoHiveSystem.cs b/Content.Shared/_RMC14/Xenonids/Hive/SharedXenoHiveSystem.cs
@@ -281,7 +281,7 @@ public void JoinBurrowedLarva(Entity<HiveComponent> hive, EntityUid user)
         if (hive.Comp.BurrowedLarva <= 0)
             return;
 
-        EntityUid? spawned = null;
+        EntityUid? larva = null;
 
         bool TrySpawnAt<T>() where T : Component
         {
@@ -295,7 +295,7 @@ bool TrySpawnAt<T>() where T : Component
                     continue;
 
                 var position = _transform.GetMoverCoordinates(uid);
-                spawned = SpawnAtPosition(hive.Comp.BurrowedLarvaId, position);
+                larva = SpawnAtPosition(hive.Comp.BurrowedLarvaId, position);
                 return true;
             }
 
@@ -309,21 +309,20 @@ bool TrySpawnAt<T>() where T : Component
             return;
         }
 
-        if (spawned == null)
+        if (larva == null)
             return;
 
         hive.Comp.BurrowedLarva--;
         Dirty(hive);
 
-        _xeno.MakeXeno(spawned.Value);
-        _hive.SetHive(spawned.Value, hive);
+        _xeno.MakeXeno(larva.Value);
+        _hive.SetHive(larva.Value, hive);
 
         if (TryComp(user, out ActorComponent? actor))
         {
-            if (!_mind.TryGetMind(actor.PlayerSession.UserId, out var mind))
-                mind = _mind.CreateMind(actor.PlayerSession.UserId);
+            var newMind = _mind.CreateMind(actor.PlayerSession.UserId, EntityManager.GetComponent<MetaDataComponent>(larva.Value).EntityName);
 
-            _mind.TransferTo(mind.Value, spawned, ghostCheckOverride: true);
+            _mind.TransferTo(newMind, larva, ghostCheckOverride: true);
         }
 
         _adminLog.Add(LogType.RMCBurrowedLarva, $"{ToPrettyString(user):player} took a burrowed larva from hive {ToPrettyString(hive):hive}.");