From ea5265a4e5c7150e21f4de5b8acbf93bc8892eed Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 2 Mar 2020 11:19:51 -0600 Subject: [PATCH] Fix an entropinnyum oversight --- .../common/block/subtile/generating/SubTileEntropinnyum.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEntropinnyum.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEntropinnyum.java index 58ad51103..7e1cd8828 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEntropinnyum.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEntropinnyum.java @@ -12,6 +12,7 @@ package vazkii.botania.common.block.subtile.generating; import net.minecraft.entity.Entity; import net.minecraft.entity.item.TNTEntity; +import net.minecraft.fluid.IFluidState; import net.minecraft.particles.ParticleTypes; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.SoundEvents; @@ -43,7 +44,8 @@ public class SubTileEntropinnyum extends TileEntityGeneratingFlower { if(!getWorld().isRemote && getMana() == 0) { List tnts = getWorld().getEntitiesWithinAABB(TNTEntity.class, new AxisAlignedBB(getEffectivePos().add(-RANGE, -RANGE, -RANGE), getEffectivePos().add(RANGE + 1, RANGE + 1, RANGE + 1))); for(TNTEntity tnt : tnts) { - if(tnt.getFuse() == 1 && !tnt.removed && !getWorld().getBlockState(new BlockPos(tnt)).getMaterial().isLiquid()) { + IFluidState fluid = getWorld().getFluidState(new BlockPos(tnt)); + if(tnt.getFuse() == 1 && tnt.isAlive() && fluid.isEmpty()) { tnt.playSound(SoundEvents.ENTITY_GENERIC_EXPLODE, 0.2F, (1F + (getWorld().rand.nextFloat() - getWorld().rand.nextFloat()) * 0.2F) * 0.7F); tnt.remove(); addMana(getMaxMana());