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

Fixed target container overflow (Infinite beaker fill from mop) (#16804)

Browse Source
This commit is contained in:
Ilya Babunov
2023-05-25 13:12:08 +04:00
committed by GitHub
parent 56f33bbae4
commit daa47ff0d1
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Content.Server/Fluids/EntitySystems/AbsorbentSystem.cs
View File

@@ -25,6 +25,7 @@ public sealed class AbsorbentSystem : SharedAbsorbentSystem
[Dependency] private readonly SharedTransformSystem _transform = default!; [Dependency] private readonly SharedTransformSystem _transform = default!;
[Dependency] private readonly SolutionContainerSystem _solutionSystem = default!; [Dependency] private readonly SolutionContainerSystem _solutionSystem = default!;
[Dependency] private readonly UseDelaySystem _useDelay = default!; [Dependency] private readonly UseDelaySystem _useDelay = default!;
[Dependency] private readonly SolutionContainerSystem _solutionContainerSystem = default!;
public override void Initialize() public override void Initialize()
{ {
@@ -158,11 +159,18 @@ public sealed class AbsorbentSystem : SharedAbsorbentSystem
return false; return false;
} }
absorberSoln.AddReagent(PuddleSystem.EvaporationReagent, water);
refillableSolution.AddSolution(nonWater, _prototype);
_solutionSystem.UpdateChemicals(used, absorberSoln); if (water > 0 && !_solutionContainerSystem.TryAddReagent(used, absorberSoln, PuddleSystem.EvaporationReagent, water,
_solutionSystem.UpdateChemicals(target, refillableSolution); out _))
{
_popups.PopupEntity(Loc.GetString("mopping-system-full", ("used", used)), used, user);
}
if (nonWater.Volume > 0 && !_solutionContainerSystem.TryAddSolution(target, refillableSolution, nonWater))
{
absorberSoln.AddSolution(nonWater, _prototype);
_popups.PopupEntity(Loc.GetString("mopping-system-full", ("used", target)), user, user);
}
_audio.PlayPvs(component.TransferSound, target); _audio.PlayPvs(component.TransferSound, target);
_useDelay.BeginDelay(used); _useDelay.BeginDelay(used);
return true; return true;