From ccc4bcbd7af3a30597d4c1c222ef1003a41eb40e Mon Sep 17 00:00:00 2001 From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> Date: Thu, 17 Feb 2022 02:53:38 +1300 Subject: [PATCH] Fix fluid spreader error (#6742) --- .../Fluids/EntitySystems/FluidSpreaderSystem.cs | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/Content.Server/Fluids/EntitySystems/FluidSpreaderSystem.cs b/Content.Server/Fluids/EntitySystems/FluidSpreaderSystem.cs index c4907bc5d6..df66569460 100644 --- a/Content.Server/Fluids/EntitySystems/FluidSpreaderSystem.cs +++ b/Content.Server/Fluids/EntitySystems/FluidSpreaderSystem.cs @@ -66,18 +66,17 @@ public sealed class FluidSpreaderSystem : EntitySystem var remQueue = new RemQueue(); foreach (var uid in _fluidSpread) { - MetaDataComponent? meta = null; + if (!TryComp(uid, out MetaDataComponent? meta) || meta.Deleted) + { + remQueue.Add(uid); + continue; + } - if (Paused(uid, meta)) + if (meta.EntityPaused) continue; - // If not paused - // it's either Deleted or will be via SpreadFluid remQueue.Add(uid); - if (Deleted(uid, meta)) - continue; - SpreadFluid(uid); }