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

Pressure movements won't affect entities in containers. Use GetCardinalDirection.

Browse Source
This commit is contained in:
Víctor Aguilera Puerto
2020-08-15 03:20:25 +02:00
parent 580e14207b
commit fd40c5157b
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/Atmos/TileAtmosphere.cs
View File

@@ -10,6 +10,7 @@ using Content.Shared.Atmos;
using Content.Shared.Audio; using Content.Shared.Audio;
using Content.Shared.Maps; using Content.Shared.Maps;
using Robust.Server.GameObjects.EntitySystems; using Robust.Server.GameObjects.EntitySystems;
using Robust.Shared.Containers;
using Robust.Shared.GameObjects.Components; using Robust.Shared.GameObjects.Components;
using Robust.Shared.GameObjects.Systems; using Robust.Shared.GameObjects.Systems;
using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
@@ -176,7 +177,8 @@ namespace Content.Server.Atmos
foreach (var entity in _entityManager.GetEntitiesIntersecting(_mapManager.GetGrid(GridIndex).ParentMapId, Box2.UnitCentered.Translated(GridIndices))) foreach (var entity in _entityManager.GetEntitiesIntersecting(_mapManager.GetGrid(GridIndex).ParentMapId, Box2.UnitCentered.Translated(GridIndices)))
{ {
if (!entity.TryGetComponent(out ICollidableComponent physics) if (!entity.TryGetComponent(out ICollidableComponent physics)
|| !entity.TryGetComponent(out MovedByPressureComponent pressure)) || !entity.TryGetComponent(out MovedByPressureComponent pressure)
|| ContainerHelpers.IsInContainer(entity))
continue; continue;
var pressureMovements = physics.EnsureController<HighPressureMovementController>(); var pressureMovements = physics.EnsureController<HighPressureMovementController>();
@@ -596,7 +598,7 @@ namespace Content.Server.Atmos
if (difference > PressureDifference) if (difference > PressureDifference)
{ {
PressureDifference = difference; PressureDifference = difference;
_pressureDirection = ((Vector2i) (tile.GridIndices - GridIndices)).GetDir(); _pressureDirection = ((Vector2i) (tile.GridIndices - GridIndices)).GetCardinalDir();
} }
} }