Fix hose pulley deleting fluid blocks when extracting FluidStack.EMPTY#10055
Open
Apertyotis wants to merge 1 commit intoCreators-of-Create:mc1.21.1/devfrom
Open
Fix hose pulley deleting fluid blocks when extracting FluidStack.EMPTY#10055Apertyotis wants to merge 1 commit intoCreators-of-Create:mc1.21.1/devfrom
Apertyotis wants to merge 1 commit intoCreators-of-Create:mc1.21.1/devfrom
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
When a pump connected to a hose pulley tries to extract fluid while its target is already full, hose pulley will delete the fluid block.

Cause
The issue is caused by an inconsistent handling of FluidStack.EMPTY.
In HosePulleyFluidHandler::drainInternal:
The hose pulley removes the fluid block (line 75) and attempts to place the remainder into its internal tank (line 94).
However, the check at line 87 compares the requested fluid (EMPTY) with the actual fluid (Water) and aborts early.
As a result, the fluid block has already been removed but no fluid is stored.
FluidStack.EMPTYLooking at FluidNetwork::tick:
During the previous simulation step, the pump already determined it needs to extract 0 mB of fluid.
Later, line 201 confirms the hose pulley can provide water. The pump then requests 0 mB of water, which effectively becomes FluidStack.EMPTY.

Fix
Either side fixing the issue would work, but this PR applies both fixes: