Skip to content

Commit

Permalink
Fix AtmosDeviceSystem debug assert Heisenbug (#29752)
Browse files Browse the repository at this point in the history
Fix AtmosDeviceSystem debug assertion Heisenbug
  • Loading branch information
Tayrtahn authored and sleepyyapril committed Dec 16, 2024
1 parent 72ddf80 commit b96307e
Show file tree
Hide file tree
Showing 2 changed files with 63 additions and 1 deletion.
53 changes: 53 additions & 0 deletions Content.IntegrationTests/Tests/Atmos/GridJoinTest.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
using Content.Server.Atmos.Components;
using Content.Server.Atmos.EntitySystems;
using Content.Server.Atmos.Piping.Components;
using Content.Server.Atmos.Piping.EntitySystems;
using Robust.Shared.GameObjects;

namespace Content.IntegrationTests.Tests.Atmos;

[TestFixture]
public sealed class GridJoinTest
{
private const string CanisterProtoId = "AirCanister";

[Test]
public async Task TestGridJoinAtmosphere()
{
await using var pair = await PoolManager.GetServerClient();
var server = pair.Server;

var entMan = server.EntMan;
var protoMan = server.ProtoMan;
var atmosSystem = entMan.System<AtmosphereSystem>();
var atmosDeviceSystem = entMan.System<AtmosDeviceSystem>();
var transformSystem = entMan.System<SharedTransformSystem>();

var testMap = await pair.CreateTestMap();

await server.WaitPost(() =>
{
// Spawn an atmos device on the grid
var canister = entMan.Spawn(CanisterProtoId);
transformSystem.SetCoordinates(canister, testMap.GridCoords);
var deviceComp = entMan.GetComponent<AtmosDeviceComponent>(canister);
var canisterEnt = (canister, deviceComp);

// Make sure the canister is tracked as an off-grid device
Assert.That(atmosDeviceSystem.IsJoinedOffGrid(canisterEnt));

// Add an atmosphere to the grid
entMan.AddComponent<GridAtmosphereComponent>(testMap.Grid);

// Force AtmosDeviceSystem to update off-grid devices
// This means the canister is now considered on-grid,
// but it's still tracked as off-grid!
Assert.DoesNotThrow(() => atmosDeviceSystem.Update(atmosSystem.AtmosTime));

// Make sure that the canister is now properly tracked as on-grid
Assert.That(atmosDeviceSystem.IsJoinedOffGrid(canisterEnt), Is.False);
});

await pair.CleanReturnAsync();
}
}
11 changes: 10 additions & 1 deletion Content.Server/Atmos/Piping/EntitySystems/AtmosDeviceSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -132,10 +132,19 @@ public override void Update(float frameTime)
var ev = new AtmosDeviceUpdateEvent(_atmosphereSystem.AtmosTime, null, null);
foreach (var device in _joinedDevices)
{
DebugTools.Assert(!HasComp<GridAtmosphereComponent>(Transform(device).GridUid));
var deviceGrid = Transform(device).GridUid;
if (HasComp<GridAtmosphereComponent>(deviceGrid))
{
RejoinAtmosphere(device);
}
RaiseLocalEvent(device, ref ev);
device.Comp.LastProcess = time;
}
}

public bool IsJoinedOffGrid(Entity<AtmosDeviceComponent> device)
{
return _joinedDevices.Contains(device);
}
}
}

0 comments on commit b96307e

Please sign in to comment.