Skip to content
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.

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

Refactor FluidTankList and Filtered Handlers #2690

Draft
wants to merge 28 commits into
base: master
Choose a base branch
from
Draft
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
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
Prev Previous commit
Next Next commit
add comments
ghzdude committed Dec 30, 2024
commit cc896329215279df69132655de92cc56c9946ebf
Original file line number Diff line number Diff line change
@@ -97,7 +97,9 @@ public int fill(FluidStack resource, boolean doFill) {
// if the tank uses distinct fluid fill (allowSameFluidFill disabled) and another distinct tank had
// received the fluid, skip this tank
if (overflow && !tank.allowSameFluidFill()) continue;
if (tank.getFluidAmount() > 0 || !tank.canFillFluidType(doFill ? copy : resource)) continue;
// if simulating, pass in the original resource since nothing was actually filled,
// otherwise pass in the mutated copy
if (!tank.canFillFluidType(doFill ? copy : resource)) continue;

// if not empty fluid doesn't match, skip
} else if (!resource.isFluidEqual(tank.getFluid()))