mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-11-10 12:33:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6145 from drwoops/bug-5921

Browse Source 
restore the invariant that draining is the inverse of filling (bug #5921)
This commit is contained in:
simibubi 2024-07-25 17:06:29 +02:00 committed by GitHub
commit 57a7b66553
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/simibubi/create/content/fluids/transfer/FluidManipulationBehaviour.java
View File

@ -38,11 +38,11 @@ public abstract class FluidManipulationBehaviour extends BlockEntityBehaviour {
public static record BlockPosEntry(BlockPos pos, int distance) {
};
public static class ChunkNotLoadedException extends Exception {
private static final long serialVersionUID = 1L;
}
BoundingBox affectedArea;
BlockPos rootPos;
boolean infinite;
@ -148,7 +148,7 @@ public abstract class FluidManipulationBehaviour extends BlockEntityBehaviour {
BiConsumer<BlockPos, Integer> add, boolean searchDownward) throws ChunkNotLoadedException {
Level world = getWorld();
int maxBlocks = maxBlocks();
int maxRange = canDrainInfinitely(fluid) ? maxRange() : maxRange() / 2;
int maxRange = maxRange();
int maxRangeSq = maxRange * maxRange;
int i;
@ -162,7 +162,7 @@ public abstract class FluidManipulationBehaviour extends BlockEntityBehaviour {
if (!world.isLoaded(currentPos))
throw new ChunkNotLoadedException();
FluidState fluidState = world.getFluidState(currentPos);
if (fluidState.isEmpty())
continue;
@ -205,7 +205,7 @@ public abstract class FluidManipulationBehaviour extends BlockEntityBehaviour {
protected void playEffect(Level world, BlockPos pos, Fluid fluid, boolean fillSound) {
if (fluid == null)
return;
BlockPos splooshPos = pos == null ? blockEntity.getBlockPos() : pos;
SoundEvent soundevent = fillSound ? fluid.getAttributes()