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

Content-side grid-parenting (#2371)

Browse Source 
Shouldn't be setting WorldPosition with these IMO.

Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
This commit is contained in:
metalgearsloth
2020-10-25 22:09:56 +11:00
committed by GitHub
parent c21920df6c
commit ab537a0f56
1 changed files with 1 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Content.Server/GameObjects/Components/Items/Storage/EntityStorageComponent.cs
View File

@@ -226,7 +226,6 @@ namespace Content.Server.GameObjects.Components.Items.Storage
private bool AddToContents(IEntity entity) private bool AddToContents(IEntity entity)
{ {
var physics = Owner.GetComponent<IPhysicsComponent>();
if (entity.TryGetComponent(out IPhysicsComponent entityPhysicsComponent)) if (entity.TryGetComponent(out IPhysicsComponent entityPhysicsComponent))
{ {
if(MaxSize < entityPhysicsComponent.WorldAABB.Size.X if(MaxSize < entityPhysicsComponent.WorldAABB.Size.X
@@ -234,39 +233,11 @@ namespace Content.Server.GameObjects.Components.Items.Storage
{ {
return false; return false;
} }
if (physics.WorldAABB.Left > entityPhysicsComponent.WorldAABB.Left)
{
entity.Transform.WorldPosition += new Vector2(physics.WorldAABB.Left - entityPhysicsComponent.WorldAABB.Left, 0);
}
else if (physics.WorldAABB.Right < entityPhysicsComponent.WorldAABB.Right)
{
entity.Transform.WorldPosition += new Vector2(physics.WorldAABB.Right - entityPhysicsComponent.WorldAABB.Right, 0);
}
if (physics.WorldAABB.Bottom > entityPhysicsComponent.WorldAABB.Bottom)
{
entity.Transform.WorldPosition += new Vector2(0, physics.WorldAABB.Bottom - entityPhysicsComponent.WorldAABB.Bottom);
}
else if (physics.WorldAABB.Top < entityPhysicsComponent.WorldAABB.Top)
{
entity.Transform.WorldPosition += new Vector2(0, physics.WorldAABB.Top - entityPhysicsComponent.WorldAABB.Top);
}
} }
if (Contents.CanInsert(entity)) if (Contents.CanInsert(entity))
{ {
// Because Insert sets the local position to (0,0), and we want to keep the contents spread out,
// we re-apply the world position after inserting.
Vector2 worldPos;
if (entity.HasComponent<IActorComponent>())
{
worldPos = Owner.Transform.WorldPosition;
}
else
{
worldPos = entity.Transform.WorldPosition;
}
Contents.Insert(entity); Contents.Insert(entity);
entity.Transform.WorldPosition = worldPos; entity.Transform.LocalPosition = Vector2.Zero;
if (entityPhysicsComponent != null) if (entityPhysicsComponent != null)
{ {
entityPhysicsComponent.CanCollide = false; entityPhysicsComponent.CanCollide = false;