Skip to content

EntitySystem.Spawn: defer MapInitEvent in SpawnNextTo/InContainer/...OrDrop #6784

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
whatston3 wants to merge 3 commits into
base: master
Choose a base branch
from
+21 −9
Open

EntitySystem.Spawn: defer MapInitEvent in SpawnNextTo/InContainer/...OrDrop #6784

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3e3a710
Call MapInit consistently on target map in SpawnX
whatston3 Jul 12, 2026
bb07de1
The rest of the owl
whatston3 Jul 12, 2026
7de8ae7
SPACE
whatston3 Jul 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 21 additions & 9 deletions Robust.Shared/GameObjects/EntityManager.Spawn.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
using Robust.Shared.Collections;
using Robust.Shared.Containers;
using Robust.Shared.Maths;
using Robust.Shared.Serialization;

namespace Robust.Shared.GameObjects;

Expand Down Expand Up @@ -151,10 +150,14 @@ 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;
Expand All @@ -176,11 +179,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, doMapInit: false);

if (_containers.Insert(uid.Value, container))
{
if (_mapSystem.IsInitialized(TransformQuery.GetComponent(containerUid).MapUid))
RunMapInit(uid.Value, MetaQuery.Comp(uid.Value));

return true;
}

DeleteEntity(uid.Value);
uid = null;
Expand All @@ -193,9 +200,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;
}

Expand All @@ -221,8 +231,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)
Expand All @@ -233,6 +242,9 @@ public EntityUid SpawnInContainerOrDrop(
_xforms.DropNextTo(uid, (containerUid, xform));
}

if (_mapSystem.IsInitialized(xform.MapUid))
RunMapInit(uid, MetaQuery.Comp(uid));

return uid;
}

Expand Down
Loading