Skip to content

Change SpawnAtPoisition EntityCoordinates overload to use the rotation of the attached entity, and to allow a rotation override. #6527

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
Princess-Cheeseballs wants to merge 3 commits into
base: master
Choose a base branch
from
+17 −1
Open

Change SpawnAtPoisition EntityCoordinates overload to use the rotation of the attached entity, and to allow a rotation override. #6527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9f051d3
minor API addition
Princess-Cheeseballs Apr 14, 2026
54b2172
better
Princess-Cheeseballs Apr 14, 2026
a1edc80
I forgor
Princess-Cheeseballs Apr 14, 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
7 changes: 7 additions & 0 deletions Robust.Client/GameObjects/ClientEntityManager.Spawn.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,13 @@ public override EntityUid PredictedSpawnAtPosition(string? protoName, EntityCoor
return ent;
}

public override EntityUid PredictedSpawnAtPosition(string? protoName, EntityCoordinates coordinates, Angle rotation, ComponentRegistry? overrides = null)
{
var ent = SpawnAtPosition(protoName, coordinates, rotation, overrides);
FlagPredicted(ent);
return ent;
}

public override bool PredictedTrySpawnNextTo(
string? protoName,
EntityUid target,
Expand Down
11 changes: 10 additions & 1 deletion Robust.Shared/GameObjects/EntityManager.Spawn.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,11 @@ public virtual EntityUid Spawn(string? protoName, MapCoordinates coordinates, Co

[MethodImpl(MethodImplOptions.AggressiveInlining)]
public EntityUid SpawnAtPosition(string? protoName, EntityCoordinates coordinates, ComponentRegistry? overrides = null)
=> Spawn(protoName, _xforms.ToMapCoordinates(coordinates), overrides);
=> SpawnAtPosition(protoName, coordinates, _xforms.GetWorldRotation(coordinates.EntityId), overrides);

[MethodImpl(MethodImplOptions.AggressiveInlining)]
public EntityUid SpawnAtPosition(string? protoName, EntityCoordinates coordinates, Angle rotation, ComponentRegistry? overrides = null)
=> Spawn(protoName, _xforms.ToMapCoordinates(coordinates), overrides, rotation: rotation);

public bool TrySpawnNextTo(
string? protoName,
Expand Down Expand Up @@ -254,6 +258,11 @@ public virtual EntityUid PredictedSpawnAtPosition(string? protoName, EntityCoord
return SpawnAtPosition(protoName, coordinates, overrides);
}

public virtual EntityUid PredictedSpawnAtPosition(string? protoName, EntityCoordinates coordinates, Angle rotation, ComponentRegistry? overrides = null)
{
return SpawnAtPosition(protoName, coordinates, rotation, overrides);
}

public virtual bool PredictedTrySpawnNextTo(
string? protoName,
EntityUid target,
Expand Down
Loading