From 1b13e5e0ec5267c6d171c0865d1df89e1bf652ea Mon Sep 17 00:00:00 2001 From: Vera Aguilera Puerto Date: Fri, 3 Dec 2021 11:30:39 +0100 Subject: [PATCH] Inline Paused --- Content.IntegrationTests/Tests/Fluids/PuddleTest.cs | 12 ++++++------ .../Light/Components/EmergencyLightComponent.cs | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Content.IntegrationTests/Tests/Fluids/PuddleTest.cs b/Content.IntegrationTests/Tests/Fluids/PuddleTest.cs index 719d17e820..6c25190407 100644 --- a/Content.IntegrationTests/Tests/Fluids/PuddleTest.cs +++ b/Content.IntegrationTests/Tests/Fluids/PuddleTest.cs @@ -101,7 +101,7 @@ namespace Content.IntegrationTests.Tests.Fluids sGrid = sMapManager.CreateGrid(sMapId); sGridId = sGrid.Index; sGridEntity = sEntityManager.GetEntity(sGrid.GridEntityId); - sGridEntity.Paused = true; // See https://github.com/space-wizards/RobustToolbox/issues/1444 + IoCManager.Resolve().GetComponent(sGridEntity.Uid).EntityPaused = true; // See https://github.com/space-wizards/RobustToolbox/issues/1444 var tileDefinition = sTileDefinitionManager["underplating"]; var tile = new Tile(tileDefinition.TileId); @@ -115,7 +115,7 @@ namespace Content.IntegrationTests.Tests.Fluids { Assert.True(sPauseManager.IsGridPaused(sGridId)); Assert.True(sPauseManager.IsMapPaused(sMapId)); - Assert.True(sGridEntity.Paused); + Assert.True((!IoCManager.Resolve().EntityExists(sGridEntity.Uid) ? EntityLifeStage.Deleted : IoCManager.Resolve().GetComponent(sGridEntity.Uid).EntityLifeStage) >= EntityLifeStage.Deleted || IoCManager.Resolve().GetComponent(sGridEntity.Uid).EntityPaused); }); float evaporateTime = default; @@ -134,9 +134,9 @@ namespace Content.IntegrationTests.Tests.Fluids evaporation = puddle.Owner.GetComponent(); - puddle.Owner.Paused = true; // See https://github.com/space-wizards/RobustToolbox/issues/1445 + IoCManager.Resolve().GetComponent(puddle.Owner.Uid).EntityPaused = true; // See https://github.com/space-wizards/RobustToolbox/issues/1445 - Assert.True(puddle.Owner.Paused); + Assert.True((!IoCManager.Resolve().EntityExists(puddle.Owner.Uid) ? EntityLifeStage.Deleted : IoCManager.Resolve().GetComponent(puddle.Owner.Uid).EntityLifeStage) >= EntityLifeStage.Deleted || IoCManager.Resolve().GetComponent(puddle.Owner.Uid).EntityPaused); // Check that the puddle is going to evaporate Assert.Positive(evaporation.EvaporateTime); @@ -154,7 +154,7 @@ namespace Content.IntegrationTests.Tests.Fluids // No evaporation due to being paused await server.WaitAssertion(() => { - Assert.True(puddle.Owner.Paused); + Assert.True((!IoCManager.Resolve().EntityExists(puddle.Owner.Uid) ? EntityLifeStage.Deleted : IoCManager.Resolve().GetComponent(puddle.Owner.Uid).EntityLifeStage) >= EntityLifeStage.Deleted || IoCManager.Resolve().GetComponent(puddle.Owner.Uid).EntityPaused); // Check that the puddle still exists Assert.False((!IoCManager.Resolve().EntityExists(puddle.Owner.Uid) ? EntityLifeStage.Deleted : IoCManager.Resolve().GetComponent(puddle.Owner.Uid).EntityLifeStage) >= EntityLifeStage.Deleted); @@ -168,7 +168,7 @@ namespace Content.IntegrationTests.Tests.Fluids { Assert.False(sPauseManager.IsMapPaused(sMapId)); Assert.False(sPauseManager.IsGridPaused(sGridId)); - Assert.False(puddle.Owner.Paused); + Assert.False((!IoCManager.Resolve().EntityExists(puddle.Owner.Uid) ? EntityLifeStage.Deleted : IoCManager.Resolve().GetComponent(puddle.Owner.Uid).EntityLifeStage) >= EntityLifeStage.Deleted || IoCManager.Resolve().GetComponent(puddle.Owner.Uid).EntityPaused); // Check that the puddle still exists Assert.False((!IoCManager.Resolve().EntityExists(puddle.Owner.Uid) ? EntityLifeStage.Deleted : IoCManager.Resolve().GetComponent(puddle.Owner.Uid).EntityLifeStage) >= EntityLifeStage.Deleted); diff --git a/Content.Server/Light/Components/EmergencyLightComponent.cs b/Content.Server/Light/Components/EmergencyLightComponent.cs index a73df9ccec..4943057884 100644 --- a/Content.Server/Light/Components/EmergencyLightComponent.cs +++ b/Content.Server/Light/Components/EmergencyLightComponent.cs @@ -80,7 +80,7 @@ namespace Content.Server.Light.Components public void OnUpdate(float frameTime) { - if ((!IoCManager.Resolve().EntityExists(Owner.Uid) ? EntityLifeStage.Deleted : IoCManager.Resolve().GetComponent(Owner.Uid).EntityLifeStage) >= EntityLifeStage.Deleted || !Owner.TryGetComponent(out BatteryComponent? battery) || Owner.Paused) + if ((!IoCManager.Resolve().EntityExists(Owner.Uid) ? EntityLifeStage.Deleted : IoCManager.Resolve().GetComponent(Owner.Uid).EntityLifeStage) >= EntityLifeStage.Deleted || !Owner.TryGetComponent(out BatteryComponent? battery) || ((!IoCManager.Resolve().EntityExists(Owner.Uid) ? EntityLifeStage.Deleted : IoCManager.Resolve().GetComponent(Owner.Uid).EntityLifeStage) >= EntityLifeStage.Deleted || IoCManager.Resolve().GetComponent(Owner.Uid).EntityPaused)) { return; }