From 727bd418fa542bf70314708b153f23d926b8714c Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Mon, 16 Dec 2019 19:03:58 +0000 Subject: [PATCH] Waterloggable fixes with the cell and cables --- src/main/java/techreborn/blocks/cable/CableBlock.java | 3 ++- src/main/java/techreborn/items/ItemDynamicCell.java | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/techreborn/blocks/cable/CableBlock.java b/src/main/java/techreborn/blocks/cable/CableBlock.java index b765bb3cc..f2733179d 100644 --- a/src/main/java/techreborn/blocks/cable/CableBlock.java +++ b/src/main/java/techreborn/blocks/cable/CableBlock.java @@ -29,6 +29,7 @@ import net.minecraft.block.BlockRenderType; import net.minecraft.block.BlockState; import net.minecraft.block.BlockWithEntity; import net.minecraft.block.Material; +import net.minecraft.block.Waterloggable; import net.minecraft.block.entity.BlockEntity; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityContext; @@ -71,7 +72,7 @@ import java.util.Map; /** * Created by modmuss50 on 19/05/2017. */ -public class CableBlock extends BlockWithEntity { +public class CableBlock extends BlockWithEntity implements Waterloggable { public static final BooleanProperty EAST = BooleanProperty.of("east"); public static final BooleanProperty WEST = BooleanProperty.of("west"); diff --git a/src/main/java/techreborn/items/ItemDynamicCell.java b/src/main/java/techreborn/items/ItemDynamicCell.java index 4b22b94bf..c442c7a12 100644 --- a/src/main/java/techreborn/items/ItemDynamicCell.java +++ b/src/main/java/techreborn/items/ItemDynamicCell.java @@ -155,9 +155,7 @@ public class ItemDynamicCell extends Item implements ItemFluidInfo { if(drainFluid != Fluids.EMPTY){ stack.decrement(1); insertOrDropStack(player, getCellWithFluid(drainFluid, 1)); - world.setBlockState(hitPos, Blocks.AIR.getDefaultState()); playEmptyingSound(player, world, hitPos, drainFluid); - return TypedActionResult.pass(stack); } }