tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Purge uses of TransformComponent.AttachToGridOrMap (#34940)

Browse Source 
Switches over all extant uses of TransformComponent.AttachToGridOrMap to use SharedTransformSystem.AttachToGridOrMap
This commit is contained in:
TemporalOroboros
2025-02-07 03:49:22 -08:00
committed by GitHub
parent 14d96e0716
commit f37d5c9f0f
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Server/Administration/Commands/WarpCommand.cs
View File

@@ -118,8 +118,9 @@ namespace Content.Server.Administration.Commands
} }
var xform = _entManager.GetComponent<TransformComponent>(playerEntity); var xform = _entManager.GetComponent<TransformComponent>(playerEntity);
var xformSystem = _entManager.System<SharedTransformSystem>();
xform.Coordinates = coords; xform.Coordinates = coords;
xform.AttachToGridOrMap(); xformSystem.AttachToGridOrMap(playerEntity, xform);
if (_entManager.TryGetComponent(playerEntity, out PhysicsComponent? physics)) if (_entManager.TryGetComponent(playerEntity, out PhysicsComponent? physics))
{ {
_entManager.System<SharedPhysicsSystem>().SetLinearVelocity(playerEntity, Vector2.Zero, body: physics); _entManager.System<SharedPhysicsSystem>().SetLinearVelocity(playerEntity, Vector2.Zero, body: physics);

6
Content.Server/Construction/ConstructionSystem.Graph.cs
View File

@@ -304,8 +304,8 @@ namespace Content.Server.Construction
return null; return null;
// [Optional] Exit if the new entity's prototype is a parent of the original // [Optional] Exit if the new entity's prototype is a parent of the original
// E.g., if an entity with the 'AirlockCommand' prototype was to be replaced with a new entity that // E.g., if an entity with the 'AirlockCommand' prototype was to be replaced with a new entity that
// had the 'Airlock' prototype, and DoNotReplaceInheritingEntities was true, the code block would // had the 'Airlock' prototype, and DoNotReplaceInheritingEntities was true, the code block would
// exit here because 'AirlockCommand' is derived from 'Airlock' // exit here because 'AirlockCommand' is derived from 'Airlock'
if (GetCurrentNode(uid, construction)?.DoNotReplaceInheritingEntities == true && if (GetCurrentNode(uid, construction)?.DoNotReplaceInheritingEntities == true &&
metaData.EntityPrototype?.ID != null) metaData.EntityPrototype?.ID != null)
@@ -362,7 +362,7 @@ namespace Content.Server.Construction
// Transform transferring. // Transform transferring.
var newTransform = Transform(newUid); var newTransform = Transform(newUid);
newTransform.AttachToGridOrMap(); // in case in hands or a container TransformSystem.AttachToGridOrMap(newUid, newTransform); // in case in hands or a container
newTransform.LocalRotation = transform.LocalRotation; newTransform.LocalRotation = transform.LocalRotation;
newTransform.Anchored = transform.Anchored; newTransform.Anchored = transform.Anchored;

1
Content.Shared/Construction/SharedConstructionSystem.cs
View File

@@ -10,6 +10,7 @@ namespace Content.Shared.Construction
{ {
[Dependency] private readonly IMapManager _mapManager = default!; [Dependency] private readonly IMapManager _mapManager = default!;
[Dependency] protected readonly IPrototypeManager PrototypeManager = default!; [Dependency] protected readonly IPrototypeManager PrototypeManager = default!;
[Dependency] protected readonly SharedTransformSystem TransformSystem = default!;
/// <summary> /// <summary>
/// Get predicate for construction obstruction checks. /// Get predicate for construction obstruction checks.

2
Content.Shared/Containers/ContainerFillSystem.cs
View File

@@ -40,7 +40,7 @@ public sealed class ContainerFillSystem : EntitySystem
if (!_containerSystem.Insert(ent, container, containerXform: xform)) if (!_containerSystem.Insert(ent, container, containerXform: xform))
{ {
Log.Error($"Entity {ToPrettyString(uid)} with a {nameof(ContainerFillComponent)} failed to insert an entity: {ToPrettyString(ent)}."); Log.Error($"Entity {ToPrettyString(uid)} with a {nameof(ContainerFillComponent)} failed to insert an entity: {ToPrettyString(ent)}.");
Transform(ent).AttachToGridOrMap(); _transform.AttachToGridOrMap(ent);
break; break;
} }
} }