Merge pull request #2989 from glutzer/hose-pulley
Fix the hose pulley fill infinite option
This commit is contained in:
commit
278837ecd3
1 changed files with 6 additions and 4 deletions
|
@ -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)
|
||||||
|
|
Loading…
Reference in a new issue