diff --git a/Content.Client/Materials/MaterialStorageSystem.cs b/Content.Client/Materials/MaterialStorageSystem.cs index b953331eb0..b4ca1f2736 100644 --- a/Content.Client/Materials/MaterialStorageSystem.cs +++ b/Content.Client/Materials/MaterialStorageSystem.cs @@ -44,7 +44,7 @@ public sealed class MaterialStorageSystem : SharedMaterialStorageSystem { if (!base.TryInsertMaterialEntity(user, toInsert, receiver, component)) return false; - _transform.DetachParentToNull(Transform(toInsert)); + _transform.DetachParentToNull(toInsert, Transform(toInsert)); return true; } } diff --git a/Content.Client/Stack/StackSystem.cs b/Content.Client/Stack/StackSystem.cs index 9da7d8d63e..34b00bc081 100644 --- a/Content.Client/Stack/StackSystem.cs +++ b/Content.Client/Stack/StackSystem.cs @@ -28,7 +28,7 @@ namespace Content.Client.Stack // TODO PREDICT ENTITY DELETION: This should really just be a normal entity deletion call. if (component.Count <= 0) { - Xform.DetachParentToNull(Transform(uid)); + Xform.DetachParentToNull(uid, Transform(uid)); return; } diff --git a/Content.Server/Parallax/BiomeSystem.cs b/Content.Server/Parallax/BiomeSystem.cs index a724e20106..f5538b5455 100644 --- a/Content.Server/Parallax/BiomeSystem.cs +++ b/Content.Server/Parallax/BiomeSystem.cs @@ -206,7 +206,7 @@ public sealed class BiomeSystem : SharedBiomeSystem // At least for now unless we do lookups or smth, only work with anchoring. if (xformQuery.TryGetComponent(ent, out var xform) && !xform.Anchored) { - _transform.AnchorEntity(xform, grid, indices); + _transform.AnchorEntity(ent, xform, grid, indices); } loadedEntities.Add(ent); diff --git a/Content.Server/Station/Systems/StationSystem.cs b/Content.Server/Station/Systems/StationSystem.cs index 26762b0393..2eb8e8d54f 100644 --- a/Content.Server/Station/Systems/StationSystem.cs +++ b/Content.Server/Station/Systems/StationSystem.cs @@ -349,7 +349,7 @@ public sealed class StationSystem : EntitySystem // TODO SERIALIZATION The station data needs to be saveable somehow, but when a map gets saved, this entity // won't be included because its in null-space. Also, what happens to shuttles on other maps? - _transform.DetachParentToNull(Transform(station)); + _transform.DetachParentToNull(station, Transform(station)); var data = AddComp(station); var metaData = MetaData(station); diff --git a/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Systems/RandomTeleportArtifactSystem.cs b/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Systems/RandomTeleportArtifactSystem.cs index cdfa2ca905..84964958f3 100644 --- a/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Systems/RandomTeleportArtifactSystem.cs +++ b/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Systems/RandomTeleportArtifactSystem.cs @@ -23,6 +23,6 @@ public sealed class RandomTeleportArtifactSystem : EntitySystem var xform = Transform(uid); _popup.PopupCoordinates(Loc.GetString("blink-artifact-popup"), xform.Coordinates, PopupType.Medium); - _xform.SetCoordinates(xform, xform.Coordinates.Offset(_random.NextVector2(component.Range))); + _xform.SetCoordinates(uid, xform, xform.Coordinates.Offset(_random.NextVector2(component.Range))); } } diff --git a/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Systems/ShuffleArtifactSystem.cs b/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Systems/ShuffleArtifactSystem.cs index 052fceacad..675d3e9387 100644 --- a/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Systems/ShuffleArtifactSystem.cs +++ b/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Systems/ShuffleArtifactSystem.cs @@ -38,7 +38,8 @@ public sealed class ShuffleArtifactSystem : EntitySystem foreach (var xform in toShuffle) { - _xform.SetCoordinates(xform, _random.PickAndTake(allCoords)); + var xformUid = xform.Owner; + _xform.SetCoordinates(xformUid, xform, _random.PickAndTake(allCoords)); } } } diff --git a/Content.Shared/Blocking/BlockingSystem.cs b/Content.Shared/Blocking/BlockingSystem.cs index 1e09524883..5d4f9cc189 100644 --- a/Content.Shared/Blocking/BlockingSystem.cs +++ b/Content.Shared/Blocking/BlockingSystem.cs @@ -173,7 +173,7 @@ public sealed partial class BlockingSystem : EntitySystem } //Don't allow someone to block if they're somehow not anchored. - _transformSystem.AnchorEntity(xform); + _transformSystem.AnchorEntity(user, xform); if (!xform.Anchored) { CantBlockError(user); @@ -238,7 +238,7 @@ public sealed partial class BlockingSystem : EntitySystem && TryComp(user, out var physicsComponent)) { if (xform.Anchored) - _transformSystem.Unanchor(xform); + _transformSystem.Unanchor(user, xform); _actionsSystem.SetToggled(component.BlockingToggleAction, false); _fixtureSystem.DestroyFixture(user, BlockingComponent.BlockFixtureID, body: physicsComponent); diff --git a/Content.Shared/Follower/FollowerSystem.cs b/Content.Shared/Follower/FollowerSystem.cs index 3edf99abe1..9411207d4e 100644 --- a/Content.Shared/Follower/FollowerSystem.cs +++ b/Content.Shared/Follower/FollowerSystem.cs @@ -73,7 +73,7 @@ public sealed class FollowerSystem : EntitySystem followedComp.Following.Add(follower); var xform = Transform(follower); - _transform.SetParent(xform, entity); + _transform.SetParent(follower, xform, entity); xform.LocalPosition = Vector2.Zero; xform.LocalRotation = Angle.Zero; diff --git a/Content.Shared/Tabletop/SharedTabletopSystem.cs b/Content.Shared/Tabletop/SharedTabletopSystem.cs index 59ec7897ce..d314ff361c 100644 --- a/Content.Shared/Tabletop/SharedTabletopSystem.cs +++ b/Content.Shared/Tabletop/SharedTabletopSystem.cs @@ -40,7 +40,7 @@ namespace Content.Shared.Tabletop // Move the entity and dirty it (we use the map ID from the entity so noone can try to be funny and move the item to another map) var transform = EntityManager.GetComponent(msg.MovedEntityUid); - _transforms.SetParent(transform, _mapMan.GetMapEntityId(transform.MapID)); + _transforms.SetParent(msg.MovedEntityUid, transform, _mapMan.GetMapEntityId(transform.MapID)); _transforms.SetLocalPositionNoLerp(transform, msg.Coordinates.Position); }