From e2924187663dd094c04cf6b9f5621d858a160d7f Mon Sep 17 00:00:00 2001 From: Vera Aguilera Puerto Date: Thu, 3 Mar 2022 11:48:27 +0100 Subject: [PATCH] Fix incorrect if statement in FlammableSystem. Should fix the FlammableComponent resolve errors on live servers. --- .../Atmos/EntitySystems/FlammableSystem.cs | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs index a92a95294d..7bafd60d7e 100644 --- a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs +++ b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs @@ -54,12 +54,15 @@ namespace Content.Server.Atmos.EntitySystems private void IgniteOnCollide(EntityUid uid, IgniteOnCollideComponent component, StartCollideEvent args) { - var otherfixture = args.OtherFixture.Body.Owner; - if (EntityManager.TryGetComponent(otherfixture, out FlammableComponent flammable)) - flammable.FireStacks += component.FireStacks; - Ignite(otherfixture, flammable); - } + var otherFixture = args.OtherFixture.Body.Owner; + if (!EntityManager.TryGetComponent(otherFixture, out FlammableComponent flammable)) + return; + + flammable.FireStacks += component.FireStacks; + Ignite(otherFixture, flammable); + } + private void OnInteractUsingEvent(EntityUid uid, FlammableComponent flammable, InteractUsingEvent args) { if (args.Handled)