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

Fix airtight entities not getting invalidated and their vacuum not being fixed (#1876)

Browse Source
This commit is contained in:
DrSmugleaf
2020-08-23 17:17:19 +02:00
committed by GitHub
parent 39f346ed42
commit 42d2334334
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Content.Server/GameObjects/Components/Atmos/AirtightComponent.cs
View File

@@ -4,6 +4,8 @@ using Robust.Server.Interfaces.GameObjects;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.GameObjects.Components.Transform; using Robust.Shared.GameObjects.Components.Transform;
using Robust.Shared.GameObjects.Systems; using Robust.Shared.GameObjects.Systems;
using Robust.Shared.Interfaces.Map;
using Robust.Shared.IoC;
using Robust.Shared.Log; using Robust.Shared.Log;
using Robust.Shared.Map; using Robust.Shared.Map;
using Robust.Shared.Serialization; using Robust.Shared.Serialization;
@@ -14,6 +16,8 @@ namespace Content.Server.GameObjects.Components.Atmos
[RegisterComponent] [RegisterComponent]
public class AirtightComponent : Component, IMapInit public class AirtightComponent : Component, IMapInit
{ {
[Dependency] private readonly IMapManager _mapManager = default!;
private (GridId, MapIndices) _lastPosition; private (GridId, MapIndices) _lastPosition;
public override string Name => "Airtight"; public override string Name => "Airtight";
@@ -56,7 +60,7 @@ namespace Content.Server.GameObjects.Components.Atmos
// down than the object magically not being airtight, so log one if the SnapGrid component // down than the object magically not being airtight, so log one if the SnapGrid component
// is missing. // is missing.
if (!Owner.EnsureComponent(out SnapGridComponent _)) if (!Owner.EnsureComponent(out SnapGridComponent _))
Logger.Warning($"Entity {Owner} at {Owner.Transform.MapPosition.ToString()} doesn't have a {nameof(SnapGridComponent)}"); Logger.Warning($"Entity {Owner} at {Owner.Transform.MapPosition.ToString()} didn't have a {nameof(SnapGridComponent)}");
UpdatePosition(); UpdatePosition();
} }
@@ -81,12 +85,13 @@ namespace Content.Server.GameObjects.Components.Atmos
if (Owner.TryGetComponent(out SnapGridComponent? snapGrid)) if (Owner.TryGetComponent(out SnapGridComponent? snapGrid))
{ {
snapGrid.OnPositionChanged -= OnTransformMove; snapGrid.OnPositionChanged -= OnTransformMove;
if (_fixVacuum)
EntitySystem.Get<AtmosphereSystem>().GetGridAtmosphere(Owner.Transform.GridID)?
.FixVacuum(snapGrid.Position);
} }
if (_fixVacuum)
{
var mapIndices = Owner.Transform.GridPosition.ToMapIndices(_mapManager);
EntitySystem.Get<AtmosphereSystem>().GetGridAtmosphere(Owner.Transform.GridID)?.FixVacuum(mapIndices);
}
UpdatePosition(); UpdatePosition();
} }
@@ -104,10 +109,8 @@ namespace Content.Server.GameObjects.Components.Atmos
private void UpdatePosition() private void UpdatePosition()
{ {
if (Owner.TryGetComponent(out SnapGridComponent? snapGrid)) var mapIndices = Owner.Transform.GridPosition.ToMapIndices(_mapManager);
{ UpdatePosition(Owner.Transform.GridID, mapIndices);
UpdatePosition(Owner.Transform.GridID, snapGrid.Position);
}
} }
private void UpdatePosition(GridId gridId, MapIndices pos) private void UpdatePosition(GridId gridId, MapIndices pos)