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

Fix for Mopped chems not transfering (#19238)

Browse Source
This commit is contained in:
Repo
2023-08-18 10:00:46 +12:00
committed by GitHub
parent dec6fe0fe5
commit 2dd042f7f9
1 changed files with 34 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -140,7 +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); _solutionContainerSystem.UpdateChemicals(used, absorberSoln, true);
if (nonWater.Volume == FixedPoint2.Zero && absorberSoln.AvailableVolume == FixedPoint2.Zero) if (nonWater.Volume == FixedPoint2.Zero && absorberSoln.AvailableVolume == FixedPoint2.Zero)
{ {
@@ -168,14 +168,44 @@ 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);
} }
var toTransferSolution = nonWater.SplitSolution(refillableSolution.AvailableVolume); // Attempt to transfer the full nonWater solution to the bucket.
if (nonWater.Volume > 0)
{
bool fullTransferSuccess = _solutionContainerSystem.TryAddSolution(target, refillableSolution, nonWater);
if (nonWater.Volume > 0 && !_solutionContainerSystem.TryAddSolution(target, refillableSolution, toTransferSolution)) // If full transfer was unsuccessful, try a partial transfer.
if (!fullTransferSuccess)
{
var partiallyTransferSolution = nonWater.SplitSolution(refillableSolution.AvailableVolume);
// Try to transfer the split solution to the bucket.
if (_solutionContainerSystem.TryAddSolution(target, refillableSolution, partiallyTransferSolution))
{
// The transfer was successful. nonWater now contains the amount that wasn't transferred.
// If there's any leftover nonWater solution, add it back to the mop.
if (nonWater.Volume > 0)
{
absorberSoln.AddSolution(nonWater, _prototype);
_solutionContainerSystem.UpdateChemicals(used, absorberSoln);
}
}
else
{
// If the transfer was unsuccessful, combine both solutions and return them to the mop.
nonWater.AddSolution(partiallyTransferSolution, _prototype);
absorberSoln.AddSolution(nonWater, _prototype);
_solutionContainerSystem.UpdateChemicals(used, absorberSoln);
}
}
}
else
{ {
_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);
_useDelay.BeginDelay(used);
return true;
_audio.PlayPvs(component.TransferSound, target); _audio.PlayPvs(component.TransferSound, target);
_useDelay.BeginDelay(used); _useDelay.BeginDelay(used);
return true; return true;