Merge branch 'mc1.18/dev' of https://github.com/Creators-of-Create/Create into mc1.18/dev

This commit is contained in:
simibubi 2022-05-22 17:23:38 +02:00
commit 84f3ca0fae

View file

@ -74,7 +74,7 @@ public class FluidFillingBehaviour extends FluidManipulationBehaviour {
(p, d) -> infinityCheckFrontier.add(new BlockPosEntry(p, d)), true); (p, d) -> infinityCheckFrontier.add(new BlockPosEntry(p, d)), true);
int maxBlocks = maxBlocks(); int maxBlocks = maxBlocks();
if (infinityCheckVisited.size() > maxBlocks && maxBlocks != -1) { if (infinityCheckVisited.size() > maxBlocks && maxBlocks != -1 && !fillInfinite()) {
if (!infinite) { if (!infinite) {
reset(); reset();
infinite = true; infinite = true;
@ -165,10 +165,12 @@ public class FluidFillingBehaviour extends FluidManipulationBehaviour {
if (visited.size() >= maxBlocks && maxBlocks != -1) { if (visited.size() >= maxBlocks && maxBlocks != -1) {
infinite = true; infinite = true;
if (!fillInfinite()) {
visited.clear(); visited.clear();
queue.clear(); queue.clear();
return false; return false;
} }
}
SpaceType spaceType = getAtPos(world, currentPos, fluid); SpaceType spaceType = getAtPos(world, currentPos, fluid);
if (spaceType == SpaceType.BLOCKING) if (spaceType == SpaceType.BLOCKING)