Skip to content

Fix fluid transfer bugs for amounts over one bucket #10604

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Apertyotis wants to merge 1 commit into
base: mc1.21.1/dev
Choose a base branch
from
Open

Fix fluid transfer bugs for amounts over one bucket #10604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/main/java/com/simibubi/create/content/fluids/OpenEndedPipe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,8 @@ public int fill(FluidStack resource, FluidAction action) {
if (action.simulate())
return fill;

containedFluidStack = getFluid();
hasBlockState = FluidHelper.hasBlockState(containedFluidStack.getFluid());
if (effectHandler != null && !resource.isEmpty()) {
// resource should be copied before giving it to the handler.
// if hasBlockState is false, it was already copied above.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/simibubi/create/content/fluids/hosePulley/HosePulleyFluidHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public int fill(FluidStack resource, FluidAction action) {
}

if (action.simulate())
return diff <= 0 ? resource.getAmount() : internalTank.fill(remaining, action);
return diff <= 0 ? resource.getAmount() : internalTank.fill(resource, action);
if (diff <= 0) {
internalTank.drain(-diff, FluidAction.EXECUTE);
return resource.getAmount();
Expand Down
Loading