juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace obsolete FromMap calls with ToCoordinates (#35304)

Browse Source
This commit is contained in:
Kyle Tyo
2025-02-20 07:03:42 -05:00
committed by GitHub
parent 5e0a1d8581
commit c8dce26dbb
8 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Shared/Storage/EntitySystems/MagnetPickupSystem.cs
View File

@@ -81,7 +81,7 @@ public sealed class MagnetPickupSystem : EntitySystem
// game state handling we can't show a lerp animation for it.
var nearXform = Transform(near);
var nearMap = _transform.GetMapCoordinates(near, xform: nearXform);
var nearCoords = EntityCoordinates.FromMap(moverCoords.EntityId, nearMap, _transform, EntityManager);
var nearCoords = _transform.ToCoordinates(moverCoords.EntityId, nearMap);
if (!_storage.Insert(uid, near, out var stacked, storageComp: storage, playSound: !playedSound))
continue;

10
Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
View File

@@ -532,10 +532,9 @@ public abstract class SharedStorageSystem : EntitySystem
{
var parent = transformOwner.ParentUid;
var position = EntityCoordinates.FromMap(
var position = TransformSystem.ToCoordinates(
parent.IsValid() ? parent : uid,
TransformSystem.GetMapCoordinates(transformEnt),
TransformSystem
TransformSystem.GetMapCoordinates(transformEnt)
);
args.Handled = true;
@@ -585,10 +584,9 @@ public abstract class SharedStorageSystem : EntitySystem
continue;
}
var position = EntityCoordinates.FromMap(
var position = TransformSystem.ToCoordinates(
xform.ParentUid.IsValid() ? xform.ParentUid : uid,
new MapCoordinates(TransformSystem.GetWorldPosition(targetXform), targetXform.MapID),
TransformSystem
new MapCoordinates(TransformSystem.GetWorldPosition(targetXform), targetXform.MapID)
);
var angle = targetXform.LocalRotation;