Skip to content

Fix fluid networks sometimes failing to rebuild in long pipelines #10603

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
+18 −1
Open

Fix fluid networks sometimes failing to rebuild in long pipelines #10603

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
15 changes: 15 additions & 0 deletions src/main/java/com/simibubi/create/content/fluids/FluidTransportBehaviour.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,12 @@ public enum UpdatePhase {

public Map<Direction, PipeConnection> interfaces;
public UpdatePhase phase;
public boolean scheduleUpdate;

public FluidTransportBehaviour(SmartBlockEntity be) {
super(be);
phase = UpdatePhase.WAIT_FOR_PUMPS;
scheduleUpdate = false;
}

public boolean canPullFluidFrom(FluidStack fluid, BlockState state, Direction direction) {
Expand All @@ -67,6 +69,13 @@ public void tick() {

if (interfaces == null)
return;

if (onServer && scheduleUpdate) {
FluidPropagator.propagateChangedPipe(world, pos, blockEntity.getBlockState());
scheduleUpdate = false;
return;
}

Collection<PipeConnection> connections = interfaces.values();

// Do not provide a lone pipe connection with its own flow input
Expand Down Expand Up @@ -159,6 +168,9 @@ public void read(CompoundTag nbt, HolderLookup.Provider registries, boolean clie

interfaces.values()
.forEach(connection -> connection.deserializeNBT(nbt, registries, blockEntity.getBlockPos(), clientPacket));

if (nbt.contains("ScheduleUpdate"))
scheduleUpdate = nbt.getBoolean("ScheduleUpdate");
}

@Override
Expand All @@ -171,6 +183,9 @@ public void write(CompoundTag nbt, HolderLookup.Provider registries, boolean cli

interfaces.values()
.forEach(connection -> connection.serializeNBT(nbt, registries, clientPacket));

if (scheduleUpdate)
nbt.putBoolean("ScheduleUpdate", true);
}

public FluidStack getProvidedOutwardFluid(Direction side) {
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/com/simibubi/create/content/fluids/pump/PumpBlockEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,10 @@ protected void distributePressureTo(Direction side) {
BlockFace blockFace = new BlockFace(currentPos, face);
BlockPos connectedPos = blockFace.getConnectedPos();

if (!level.isLoaded(connectedPos))
if (!level.isLoaded(connectedPos)) {
pipe.scheduleUpdate = true;
continue;
}
if (blockFace.isEquivalent(start))
continue;
if (hasReachedValidEndpoint(level, blockFace, pull)) {
Expand Down
Loading