mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 03:35:51 +00:00
Code Releases Activity

Fixed Fluid Pump dupe.

Browse Source
This commit is contained in:
LinoxGH 2020-08-27 20:08:02 +03:00 committed by GitHub
parent f97935b5c7
commit 53abf76a35
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/FluidPump.java
View File

@ -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);
}
@ -149,6 +149,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() {