Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Engine update (#12307)

Browse Source
This commit is contained in:
Leon Friedrich
2022-10-31 15:56:17 +13:00
committed by GitHub
parent 9b71a5658b
commit 78e5e96a3c
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Server/Disposal/Unit/EntitySystems/DisposableSystem.cs
View File

@@ -105,7 +105,6 @@ namespace Content.Server.Disposal.Unit.EntitySystems
} }
// Insert into next tube // Insert into next tube
holderTransform.Coordinates = new EntityCoordinates(toUid, Vector2.Zero);
if (!to.Contents.Insert(holder.Owner)) if (!to.Contents.Insert(holder.Owner))
{ {
ExitDisposals(holderUid, holder, holderTransform); ExitDisposals(holderUid, holder, holderTransform);
@@ -117,7 +116,6 @@ namespace Content.Server.Disposal.Unit.EntitySystems
holder.PreviousTube = holder.CurrentTube; holder.PreviousTube = holder.CurrentTube;
holder.PreviousDirection = holder.CurrentDirection; holder.PreviousDirection = holder.CurrentDirection;
} }
holderTransform.Coordinates = toTransform.Coordinates;
holder.CurrentTube = to; holder.CurrentTube = to;
holder.CurrentDirection = to.NextDirection(holder); holder.CurrentDirection = to.NextDirection(holder);
holder.StartingTime = 0.1f; holder.StartingTime = 0.1f;
@@ -168,7 +166,8 @@ namespace Content.Server.Disposal.Unit.EntitySystems
var destination = holder.CurrentDirection.ToVec(); var destination = holder.CurrentDirection.ToVec();
var newPosition = destination * progress; var newPosition = destination * progress;
EntityManager.GetComponent<TransformComponent>(holder.Owner).Coordinates = origin.Offset(newPosition); // This is some supreme shit code.
EntityManager.GetComponent<TransformComponent>(holder.Owner).Coordinates = origin.Offset(newPosition).WithEntityId(currentTube.Owner); ;
continue; continue;
} }

2
RobustToolbox

Submodule RobustToolbox updated: df7933b890...03acded657