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

Inline Deleted

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-03 11:30:03 +01:00
parent 149707a566
commit b2035543e2
60 changed files with 94 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/StationEvents/Events/GasLeak.cs
View File

@@ -123,7 +123,7 @@ namespace Content.Server.StationEvents.Events
if (!_foundTile ||
_targetGrid == null ||
_targetGrid.Deleted ||
(!IoCManager.Resolve<IEntityManager>().EntityExists(_targetGrid.Uid) ? EntityLifeStage.Deleted : IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(_targetGrid.Uid).EntityLifeStage) >= EntityLifeStage.Deleted ||
!atmosphereSystem.IsSimulatedGrid(_targetGrid.Transform.GridID))
{
Running = false;
@@ -156,7 +156,7 @@ namespace Content.Server.StationEvents.Events
{
if (!_foundTile ||
_targetGrid == null ||
_targetGrid.Deleted ||
(!IoCManager.Resolve<IEntityManager>().EntityExists(_targetGrid.Uid) ? EntityLifeStage.Deleted : IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(_targetGrid.Uid).EntityLifeStage) >= EntityLifeStage.Deleted ||
!atmosphereSystem.IsSimulatedGrid(_targetGrid.Transform.GridID))
{
return;

2
Content.Server/StationEvents/Events/PowerGridCheck.cs
View File

@@ -53,7 +53,7 @@ namespace Content.Server.StationEvents.Events
{
foreach (var entity in _powered)
{
if (entity.Deleted) continue;
if ((!IoCManager.Resolve<IEntityManager>().EntityExists(entity.Uid) ? EntityLifeStage.Deleted : IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(entity.Uid).EntityLifeStage) >= EntityLifeStage.Deleted) continue;
if (entity.TryGetComponent(out ApcPowerReceiverComponent? powerReceiverComponent))
{