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

Remove atmos assert, fix GridRevalidate adding virtual space tiles to list of active tiles on grid.

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-10-07 16:51:36 +02:00
parent 094841314a
commit ef45db6811
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -305,7 +305,7 @@ namespace Content.Server.Atmos.EntitySystems
{ {
var direction = (AtmosDirection) (1 << i); var direction = (AtmosDirection) (1 << i);
var otherIndices = indices.Offset(direction); var otherIndices = indices.Offset(direction);
var otherTile = GetTileAtmosphereOrCreateSpace(mapGrid, gridAtmosphere, otherIndices); var otherTile = GetTileAtmosphere(gridAtmosphere, otherIndices);
if (otherTile != null) if (otherTile != null)
AddActiveTile(gridAtmosphere, otherTile); AddActiveTile(gridAtmosphere, otherTile);
} }
@@ -523,12 +523,12 @@ namespace Content.Server.Atmos.EntitySystems
{ {
var tileAtmosphere = GetTileAtmosphere(gridAtmosphere, tile); var tileAtmosphere = GetTileAtmosphere(gridAtmosphere, tile);
if (tileAtmosphere != null) // Please note, you might run into a race condition when using this or GetTileAtmosphere.
return tileAtmosphere; // The race condition occurs when a tile goes from being space to not-space, and then something
// attempts to get the tile atmosphere for it before it has been revalidated by atmos.
// The tile atmosphere will get revalidated on the next atmos tick, however.
// That tile must be space, or something has gone horribly wrong! return tileAtmosphere ?? new TileAtmosphere(mapGrid.Index, tile, new GasMixture(Atmospherics.CellVolume) {Temperature = Atmospherics.TCMB}, true);
DebugTools.Assert(IsTileSpace(mapGrid, tile));
return new TileAtmosphere(mapGrid.Index, tile, new GasMixture(Atmospherics.CellVolume) {Temperature = Atmospherics.TCMB}, true);
} }
#endregion #endregion