]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Fix GasMixers/Filters not working (#26568)
authorPlykiya <58439124+Plykiya@users.noreply.github.com>
Sat, 30 Mar 2024 18:11:44 +0000 (11:11 -0700)
committerGitHub <noreply@github.com>
Sat, 30 Mar 2024 18:11:44 +0000 (14:11 -0400)
* Fix GasMixers/Filters not working

* OKAY GAS FILTERS TOO

---------

Co-authored-by: Plykiya <plykiya@protonmail.com>
Content.Server/Atmos/Piping/Trinary/EntitySystems/GasFilterSystem.cs
Content.Server/NodeContainer/EntitySystems/NodeContainerSystem.cs

index f856946a9252efd90fc57c15dd399f985e8234fe..fbd4260469401fbf71b3fb7cfd4c78bdf39012a1 100644 (file)
@@ -53,7 +53,7 @@ namespace Content.Server.Atmos.Piping.Trinary.EntitySystems
         private void OnFilterUpdated(EntityUid uid, GasFilterComponent filter, ref AtmosDeviceUpdateEvent args)
         {
             if (!filter.Enabled
-                || !_nodeContainer.TryGetNodes(uid, filter.InletName, filter.OutletName, filter.FilterName, out PipeNode? inletNode, out PipeNode? filterNode, out PipeNode? outletNode)
+                || !_nodeContainer.TryGetNodes(uid, filter.InletName, filter.FilterName, filter.OutletName, out PipeNode? inletNode, out PipeNode? filterNode, out PipeNode? outletNode)
                 || outletNode.Air.Pressure >= Atmospherics.MaxOutputPressure) // No need to transfer if target is full.
             {
                 _ambientSoundSystem.SetAmbience(uid, false);
index 19b811a287f7be19ba9bb2817d1cf434955acf64..c0603949be551cdeb06251d7d59fbc286731d8ec 100644 (file)
@@ -106,7 +106,7 @@ namespace Content.Server.NodeContainer.EntitySystems
                 && ent.Comp.Nodes.TryGetValue(id2, out var n2)
                 && n2 is T2 t2
                 && ent.Comp.Nodes.TryGetValue(id3, out var n3)
-                && n2 is T3 t3)
+                && n3 is T3 t3)
             {
                 node1 = t1;
                 node2 = t2;