From 3e3a710fe02db844bcb3796a026d1792f1a13ea9 Mon Sep 17 00:00:00 2001 From: Whatstone Date: Sun, 12 Jul 2026 09:29:41 -0400 Subject: [PATCH 1/3] Call MapInit consistently on target map in SpawnX --- Robust.Shared/GameObjects/EntityManager.Spawn.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Robust.Shared/GameObjects/EntityManager.Spawn.cs b/Robust.Shared/GameObjects/EntityManager.Spawn.cs index 046cf3deab5..cd86d46f879 100644 --- a/Robust.Shared/GameObjects/EntityManager.Spawn.cs +++ b/Robust.Shared/GameObjects/EntityManager.Spawn.cs @@ -176,11 +176,15 @@ public bool TrySpawnInContainer( if (!containerComp.Containers.TryGetValue(containerId, out var container)) return false; - var doMapInit = _mapSystem.IsInitialized(TransformQuery.GetComponent(containerUid).MapUid); - uid = Spawn(protoName, overrides, doMapInit); + uid = Spawn(protoName, overrides, false); if (_containers.Insert(uid.Value, container)) + { + if (_mapSystem.IsInitialized(TransformQuery.GetComponent(containerUid).MapUid) + && MetaQuery.TryComp(uid, out var metaData)) + RunMapInit(uid.Value, metaData); return true; + } DeleteEntity(uid.Value); uid = null; From bb07de17351e660bee1f9aacaa0ced211d1439a1 Mon Sep 17 00:00:00 2001 From: Whatstone Date: Sun, 12 Jul 2026 10:45:33 -0400 Subject: [PATCH 2/3] The rest of the owl --- .../GameObjects/EntityManager.Spawn.cs | 29 ++++++++++++------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/Robust.Shared/GameObjects/EntityManager.Spawn.cs b/Robust.Shared/GameObjects/EntityManager.Spawn.cs index cd86d46f879..7c69dee4e21 100644 --- a/Robust.Shared/GameObjects/EntityManager.Spawn.cs +++ b/Robust.Shared/GameObjects/EntityManager.Spawn.cs @@ -7,7 +7,6 @@ using Robust.Shared.Collections; using Robust.Shared.Containers; using Robust.Shared.Maths; -using Robust.Shared.Serialization; namespace Robust.Shared.GameObjects; @@ -151,10 +150,13 @@ public bool TrySpawnNextTo( return true; } - var doMapInit = _mapSystem.IsInitialized(xform.MapUid); - uid = Spawn(protoName, overrides, doMapInit); + uid = Spawn(protoName, overrides, doMapInit: false); if (_containers.Insert(uid.Value, container)) + { + if (_mapSystem.IsInitialized(xform.MapUid)) + RunMapInit(uid.Value, MetaQuery.Comp(uid.Value)); return true; + } DeleteEntity(uid.Value); uid = null; @@ -176,13 +178,13 @@ public bool TrySpawnInContainer( if (!containerComp.Containers.TryGetValue(containerId, out var container)) return false; - uid = Spawn(protoName, overrides, false); + uid = Spawn(protoName, overrides, doMapInit: false); if (_containers.Insert(uid.Value, container)) { - if (_mapSystem.IsInitialized(TransformQuery.GetComponent(containerUid).MapUid) - && MetaQuery.TryComp(uid, out var metaData)) - RunMapInit(uid.Value, metaData); + if (_mapSystem.IsInitialized(TransformQuery.GetComponent(containerUid).MapUid)) + RunMapInit(uid.Value, MetaQuery.Comp(uid.Value)); + return true; } @@ -197,9 +199,12 @@ public EntityUid SpawnNextToOrDrop(string? protoName, EntityUid target, Transfor if (!xform.ParentUid.IsValid()) return Spawn(protoName); - var doMapInit = _mapSystem.IsInitialized(xform.MapUid); - var uid = Spawn(protoName, overrides, doMapInit); + var uid = Spawn(protoName, overrides, doMapInit: false); _xforms.DropNextTo(uid, target); + + if (_mapSystem.IsInitialized(xform.MapUid)) + RunMapInit(uid, MetaQuery.Comp(uid)); + return uid; } @@ -225,8 +230,7 @@ public EntityUid SpawnInContainerOrDrop( { inserted = true; xform ??= TransformQuery.GetComponent(containerUid); - var doMapInit = _mapSystem.IsInitialized(xform.MapUid); - var uid = Spawn(protoName, overrides, doMapInit); + var uid = Spawn(protoName, overrides, doMapInit: false); if ((containerComp == null && !TryGetComponent(containerUid, out containerComp)) || !containerComp.Containers.TryGetValue(containerId, out var container) @@ -237,6 +241,9 @@ public EntityUid SpawnInContainerOrDrop( _xforms.DropNextTo(uid, (containerUid, xform)); } + if (_mapSystem.IsInitialized(xform.MapUid)) + RunMapInit(uid, MetaQuery.Comp(uid)); + return uid; } From 7de8ae786ddc7535f5c69a4ef1b85ada6c25d13f Mon Sep 17 00:00:00 2001 From: Whatstone Date: Sun, 12 Jul 2026 11:13:13 -0400 Subject: [PATCH 3/3] SPACE --- Robust.Shared/GameObjects/EntityManager.Spawn.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Robust.Shared/GameObjects/EntityManager.Spawn.cs b/Robust.Shared/GameObjects/EntityManager.Spawn.cs index 7c69dee4e21..11bbb2b8d38 100644 --- a/Robust.Shared/GameObjects/EntityManager.Spawn.cs +++ b/Robust.Shared/GameObjects/EntityManager.Spawn.cs @@ -155,6 +155,7 @@ public bool TrySpawnNextTo( { if (_mapSystem.IsInitialized(xform.MapUid)) RunMapInit(uid.Value, MetaQuery.Comp(uid.Value)); + return true; }