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

Mop fix (#18758)

Browse Source
This commit is contained in:
Fahasor
2023-08-07 20:47:34 +03:00
committed by GitHub
parent 1b6eca1f70
commit c34878e775
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -140,6 +140,7 @@ public sealed class AbsorbentSystem : SharedAbsorbentSystem
// Remove water on target // Remove water on target
// Then do the transfer. // Then do the transfer.
var nonWater = absorberSoln.SplitSolutionWithout(component.PickupAmount, PuddleSystem.EvaporationReagent); var nonWater = absorberSoln.SplitSolutionWithout(component.PickupAmount, PuddleSystem.EvaporationReagent);
_solutionContainerSystem.UpdateChemicals(used, absorberSoln);
if (nonWater.Volume == FixedPoint2.Zero && absorberSoln.AvailableVolume == FixedPoint2.Zero) if (nonWater.Volume == FixedPoint2.Zero && absorberSoln.AvailableVolume == FixedPoint2.Zero)
{ {
@@ -152,6 +153,7 @@ public sealed class AbsorbentSystem : SharedAbsorbentSystem
absorberSoln.AvailableVolume; absorberSoln.AvailableVolume;
var water = refillableSolution.RemoveReagent(PuddleSystem.EvaporationReagent, transferAmount); var water = refillableSolution.RemoveReagent(PuddleSystem.EvaporationReagent, transferAmount);
_solutionContainerSystem.UpdateChemicals(target, refillableSolution);
if (water == FixedPoint2.Zero && nonWater.Volume == FixedPoint2.Zero) if (water == FixedPoint2.Zero && nonWater.Volume == FixedPoint2.Zero)
{ {
@@ -166,11 +168,14 @@ public sealed class AbsorbentSystem : SharedAbsorbentSystem
_popups.PopupEntity(Loc.GetString("mopping-system-full", ("used", used)), used, user); _popups.PopupEntity(Loc.GetString("mopping-system-full", ("used", used)), used, user);
} }
if (nonWater.Volume > 0 && !_solutionContainerSystem.TryAddSolution(target, refillableSolution, nonWater)) var toTransferSolution = nonWater.SplitSolution(refillableSolution.AvailableVolume);
if (nonWater.Volume > 0 && !_solutionContainerSystem.TryAddSolution(target, refillableSolution, toTransferSolution))
{ {
absorberSoln.AddSolution(nonWater, _prototype);
_popups.PopupEntity(Loc.GetString("mopping-system-full", ("used", target)), user, user); _popups.PopupEntity(Loc.GetString("mopping-system-full", ("used", target)), user, user);
} }
_solutionContainerSystem.TryAddSolution(used, absorberSoln, nonWater);
_audio.PlayPvs(component.TransferSound, target); _audio.PlayPvs(component.TransferSound, target);
_useDelay.BeginDelay(used); _useDelay.BeginDelay(used);
return true; return true;