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

Optimise high pressure movements slightly (#6287)

Browse Source
This commit is contained in:
metalgearsloth
2022-01-26 22:17:15 +11:00
committed by GitHub
parent 40c406c40d
commit 48e075b67e
4 changed files with 12 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.Server/Atmos/EntitySystems/AtmosphereSystem.HighPressureDelta.cs
View File

@@ -2,12 +2,9 @@ using Content.Server.Atmos.Components;
using Content.Shared.Atmos;
using Content.Shared.Audio;
using Robust.Shared.Audio;
using Robust.Shared.Containers;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Map;
using Robust.Shared.Maths;
using Robust.Shared.Physics;
using Robust.Shared.Player;
using Robust.Shared.ViewVariables;
@@ -22,7 +19,7 @@ namespace Content.Server.Atmos.EntitySystems
[ViewVariables(VVAccess.ReadWrite)]
public string? SpaceWindSound { get; private set; } = "/Audio/Effects/space_wind.ogg";
private void HighPressureMovements(GridAtmosphereComponent gridAtmosphere, TileAtmosphere tile)
private void HighPressureMovements(GridAtmosphereComponent gridAtmosphere, TileAtmosphere tile, EntityQuery<PhysicsComponent> bodies, EntityQuery<TransformComponent> xforms, EntityQuery<MovedByPressureComponent> pressureQuery)
{
// TODO ATMOS finish this
@@ -39,9 +36,10 @@ namespace Content.Server.Atmos.EntitySystems
foreach (var entity in _lookup.GetEntitiesIntersecting(tile.GridIndex, tile.GridIndices))
{
if (!HasComp<IPhysBody>(entity)
|| !entity.IsMovedByPressure(out var pressure)
|| entity.IsInContainer())
// Ideally containers would have their own EntityQuery internally or something given recursively it may need to slam GetComp<T> anyway.
if (!bodies.HasComponent(entity)
|| !pressureQuery.TryGetComponent(entity, out var pressure) || !pressure.Enabled
|| _containers.IsEntityInContainer(entity, xforms.GetComponent(entity)))
continue;
var pressureMovements = EnsureComp<MovedByPressureComponent>(entity);