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

Inline Transform

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-03 14:20:34 +01:00
parent 69b270017b
commit a5b57c8e10
283 changed files with 742 additions and 709 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Server/Storage/Components/EntityStorageComponent.cs
View File

@@ -325,7 +325,7 @@ namespace Content.Server.Storage.Components
public virtual Vector2 ContentsDumpPosition()
{
return Owner.Transform.WorldPosition;
return IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(Owner.Uid).WorldPosition;
}
private void EmptyContents()
@@ -334,7 +334,7 @@ namespace Content.Server.Storage.Components
{
if (Contents.Remove(contained))
{
contained.Transform.WorldPosition = ContentsDumpPosition();
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(contained.Uid).WorldPosition = ContentsDumpPosition();
if (IoCManager.Resolve<IEntityManager>().TryGetComponent<IPhysBody?>(contained.Uid, out var physics))
{
physics.CanCollide = true;
@@ -369,13 +369,13 @@ namespace Content.Server.Storage.Components
// Trying to add while open just dumps it on the ground below us.
if (Open)
{
entity.Transform.WorldPosition = Owner.Transform.WorldPosition;
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(entity.Uid).WorldPosition = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(Owner.Uid).WorldPosition;
return true;
}
if (!Contents.Insert(entity)) return false;
entity.Transform.LocalPosition = Vector2.Zero;
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(entity.Uid).LocalPosition = Vector2.Zero;
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(entity.Uid, out IPhysBody? body))
{
body.CanCollide = false;