mirror of
https://github.com/StarWishsama/Slimefun4.git
synced 2024-09-20 03:35:51 +00:00
Fixed Fluid Pump dupe.
This commit is contained in:
parent
f97935b5c7
commit
53abf76a35
@ -130,12 +130,12 @@ public class FluidPump extends SimpleSlimefunItem<BlockTicker> implements Invent
|
||||
}
|
||||
|
||||
private void consumeFluid(Block fluid) {
|
||||
if (fluid.getType() == Material.WATER) {
|
||||
if (fluid.getType() == Material.STATIONARY_WATER) {
|
||||
fluid.setType(Material.AIR);
|
||||
return;
|
||||
}
|
||||
|
||||
List<Block> list = Vein.find(fluid, RANGE, block -> block.isLiquid() && block.getType() == fluid.getType());
|
||||
List<Block> list = Vein.find(fluid, RANGE, block -> isLiquid(block) && block.getType() == fluid.getType());
|
||||
list.get(list.size() - 1).setType(Material.AIR);
|
||||
}
|
||||
|
||||
@ -150,6 +150,14 @@ public class FluidPump extends SimpleSlimefunItem<BlockTicker> implements Invent
|
||||
return Optional.empty();
|
||||
}
|
||||
|
||||
private boolean isLiquid(Block block) {
|
||||
BlockData data = block.getBlockData();
|
||||
if (data instanceof Levelled) {
|
||||
return ((Levelled) data).getLevel == 0;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockTicker getItemHandler() {
|
||||
return new BlockTicker() {
|
||||
|
Loading…
Reference in New Issue
Block a user