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

Fix disposals error when sending something to space (#7626)

Browse Source
This commit is contained in:
Leon Friedrich
2022-04-18 20:01:32 +12:00
committed by GitHub
parent c3728314d0
commit df7289d17c
1 changed files with 21 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,16 +1,11 @@
using System.Linq; using System.Linq;
using Content.Server.Atmos;
using Content.Server.Atmos.EntitySystems; using Content.Server.Atmos.EntitySystems;
using Content.Server.Disposal.Tube.Components; using Content.Server.Disposal.Tube.Components;
using Content.Server.Disposal.Tube; using Content.Server.Disposal.Tube;
using Content.Server.Disposal.Unit.Components; using Content.Server.Disposal.Unit.Components;
using JetBrains.Annotations; using JetBrains.Annotations;
using Robust.Shared.Containers; using Robust.Shared.Containers;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Map; using Robust.Shared.Map;
using Robust.Shared.Log;
using Robust.Shared.Maths;
using Robust.Shared.Physics; using Robust.Shared.Physics;
namespace Content.Server.Disposal.Unit.EntitySystems namespace Content.Server.Disposal.Unit.EntitySystems
@@ -21,6 +16,7 @@ namespace Content.Server.Disposal.Unit.EntitySystems
[Dependency] private readonly IMapManager _mapManager = default!; [Dependency] private readonly IMapManager _mapManager = default!;
[Dependency] private readonly DisposalUnitSystem _disposalUnitSystem = default!; [Dependency] private readonly DisposalUnitSystem _disposalUnitSystem = default!;
[Dependency] private readonly DisposalTubeSystem _disposalTubeSystem = default!; [Dependency] private readonly DisposalTubeSystem _disposalTubeSystem = default!;
[Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!;
public void ExitDisposals(EntityUid uid, DisposalHolderComponent? holder = null, TransformComponent? holderTransform = null) public void ExitDisposals(EntityUid uid, DisposalHolderComponent? holder = null, TransformComponent? holderTransform = null)
{ {
@@ -36,40 +32,37 @@ namespace Content.Server.Disposal.Unit.EntitySystems
// Check for a disposal unit to throw them into and then eject them from it. // Check for a disposal unit to throw them into and then eject them from it.
// *This ejection also makes the target not collide with the unit.* // *This ejection also makes the target not collide with the unit.*
// *This is on purpose.* // *This is on purpose.*
var grid = _mapManager.GetGrid(holderTransform.GridID);
var gridTileContents = grid.GetLocal(holderTransform.Coordinates);
DisposalUnitComponent? duc = null; DisposalUnitComponent? duc = null;
foreach (var contentUid in gridTileContents) if (_mapManager.TryGetGrid(holderTransform.GridID, out var grid))
{
foreach (var contentUid in grid.GetLocal(holderTransform.Coordinates))
{ {
if (EntityManager.TryGetComponent(contentUid, out duc)) if (EntityManager.TryGetComponent(contentUid, out duc))
break; break;
} }
}
foreach (var entity in holder.Container.ContainedEntities.ToArray()) foreach (var entity in holder.Container.ContainedEntities.ToArray())
{ {
if (HasComp<BeingDisposedComponent>(entity)) RemComp<BeingDisposedComponent>(entity);
RemComp <BeingDisposedComponent>(entity);
if (EntityManager.TryGetComponent(entity, out IPhysBody? physics)) if (EntityManager.TryGetComponent(entity, out IPhysBody? physics))
{ {
physics.CanCollide = true; physics.CanCollide = true;
} }
holder.Container.ForceRemove(entity); var meta = MetaData(entity);
holder.Container.ForceRemove(entity, EntityManager, meta);
var xform = Transform(entity);
if (xform.ParentUid != uid)
continue;
if (EntityManager.GetComponent<TransformComponent>(entity).Parent == holderTransform)
{
if (duc != null) if (duc != null)
{ duc.Container.Insert(entity, EntityManager, xform, meta: meta);
// Insert into disposal unit
EntityManager.GetComponent<TransformComponent>(entity).Coordinates = new EntityCoordinates((duc).Owner, Vector2.Zero);
duc.Container.Insert(entity);
}
else else
{ xform.AttachParentToContainerOrGrid(EntityManager);
EntityManager.GetComponent<TransformComponent>(entity).AttachParentToContainerOrGrid();
}
}
} }
if (duc != null) if (duc != null)
@@ -77,11 +70,9 @@ namespace Content.Server.Disposal.Unit.EntitySystems
_disposalUnitSystem.TryEjectContents(duc); _disposalUnitSystem.TryEjectContents(duc);
} }
var atmosphereSystem = EntitySystem.Get<AtmosphereSystem>(); if (_atmosphereSystem.GetTileMixture(holderTransform.Coordinates, true) is {} environment)
if (atmosphereSystem.GetTileMixture(holderTransform.Coordinates, true) is {} environment)
{ {
atmosphereSystem.Merge(environment, holder.Air); _atmosphereSystem.Merge(environment, holder.Air);
holder.Air.Clear(); holder.Air.Clear();
} }