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

Actually fix NRE in atmos.

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2020-12-05 20:09:22 +01:00
parent 74e1deba2f
commit 2b59159363
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -236,7 +236,7 @@ namespace Content.Server.Atmos
} }
} }
[MethodImpl(MethodImplOptions.AggressiveInlining)] //[MethodImpl(MethodImplOptions.AggressiveInlining)]
public void EqualizePressureInZone(int cycleNum) public void EqualizePressureInZone(int cycleNum)
{ {
if (Air == null || (_tileAtmosInfo.LastCycle >= cycleNum)) return; // Already done. if (Air == null || (_tileAtmosInfo.LastCycle >= cycleNum)) return; // Already done.
@@ -427,7 +427,7 @@ namespace Content.Server.Atmos
if (!tile._adjacentBits.IsFlagSet(direction)) continue; if (!tile._adjacentBits.IsFlagSet(direction)) continue;
var tile2 = tile._adjacentTiles[k]; var tile2 = tile._adjacentTiles[k];
if (giver._tileAtmosInfo.MoleDelta <= 0) break; // We're done here now. Let's not do more work than needed. if (giver._tileAtmosInfo.MoleDelta <= 0) break; // We're done here now. Let's not do more work than needed.
if (tile2._tileAtmosInfo.LastQueueCycle != queueCycle) continue; if (tile2 == null || tile2._tileAtmosInfo.LastQueueCycle != queueCycle) continue;
if (tile2._tileAtmosInfo.LastSlowQueueCycle == queueCycleSlow) continue; if (tile2._tileAtmosInfo.LastSlowQueueCycle == queueCycleSlow) continue;
queue[queueLength++] = tile2; queue[queueLength++] = tile2;
@@ -496,7 +496,7 @@ namespace Content.Server.Atmos
var tile2 = tile._adjacentTiles[k]; var tile2 = tile._adjacentTiles[k];
if (taker._tileAtmosInfo.MoleDelta >= 0) break; // We're done here now. Let's not do more work than needed. if (taker._tileAtmosInfo.MoleDelta >= 0) break; // We're done here now. Let's not do more work than needed.
if (tile2._tileAtmosInfo.LastQueueCycle != queueCycle) continue; if (tile2 == null || tile2._tileAtmosInfo.LastQueueCycle != queueCycle) continue;
if (tile2._tileAtmosInfo.LastSlowQueueCycle == queueCycleSlow) continue; if (tile2._tileAtmosInfo.LastSlowQueueCycle == queueCycleSlow) continue;
queue[queueLength++] = tile2; queue[queueLength++] = tile2;
tile2._tileAtmosInfo.LastSlowQueueCycle = queueCycleSlow; tile2._tileAtmosInfo.LastSlowQueueCycle = queueCycleSlow;

3
Content.Server/GameObjects/Components/Atmos/GridAtmosphereComponent.cs
View File

@@ -585,8 +585,7 @@ namespace Content.Server.GameObjects.Components.Atmos
while (_currentRunTiles.Count > 0) while (_currentRunTiles.Count > 0)
{ {
var tile = _currentRunTiles.Dequeue(); var tile = _currentRunTiles.Dequeue();
// ReSharper disable once ConstantConditionalAccessQualifier tile.EqualizePressureInZone(UpdateCounter);
tile?.EqualizePressureInZone(UpdateCounter);
if (number++ < LagCheckIterations) continue; if (number++ < LagCheckIterations) continue;
number = 0; number = 0;