From 826187466502bd90a5f5ecac366c61cf027675c9 Mon Sep 17 00:00:00 2001 From: drcrazy Date: Mon, 25 Mar 2019 14:36:48 +0300 Subject: [PATCH] Should fix #1691 --- .../techreborn/tiles/generator/TileCreativeSolarPanel.java | 1 - .../java/techreborn/tiles/generator/TileLightningRod.java | 7 ++++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/techreborn/tiles/generator/TileCreativeSolarPanel.java b/src/main/java/techreborn/tiles/generator/TileCreativeSolarPanel.java index 3e8024ad8..4b1bf5277 100644 --- a/src/main/java/techreborn/tiles/generator/TileCreativeSolarPanel.java +++ b/src/main/java/techreborn/tiles/generator/TileCreativeSolarPanel.java @@ -32,7 +32,6 @@ import net.minecraftforge.energy.CapabilityEnergy; import net.minecraftforge.energy.IEnergyStorage; import reborncore.api.IToolDrop; import reborncore.api.power.EnumPowerTier; -import reborncore.common.powerSystem.PowerSystem; import reborncore.common.powerSystem.TilePowerAcceptor; import techreborn.init.ModBlocks; diff --git a/src/main/java/techreborn/tiles/generator/TileLightningRod.java b/src/main/java/techreborn/tiles/generator/TileLightningRod.java index b5283e326..3e9e932b9 100644 --- a/src/main/java/techreborn/tiles/generator/TileLightningRod.java +++ b/src/main/java/techreborn/tiles/generator/TileLightningRod.java @@ -65,8 +65,9 @@ public class TileLightningRod extends TilePowerAcceptor implements IToolDrop { --onStatusHoldTicks; if (onStatusHoldTicks == 0 || getEnergy() <= 0) { - if (getBlockType() instanceof BlockMachineBase) - ((BlockMachineBase) getBlockType()).setActive(false, world, pos); + if (world.getBlockState(pos).getBlock() instanceof BlockMachineBase) { + ((BlockMachineBase) world.getBlockState(pos).getBlock()).setActive(false, world, pos); + } onStatusHoldTicks = -1; } @@ -87,7 +88,7 @@ public class TileLightningRod extends TilePowerAcceptor implements IToolDrop { world.addWeatherEffect(lightningBolt); world.spawnEntity(lightningBolt); addEnergy(baseEnergyStrike * (0.3F + weatherStrength)); - ((BlockMachineBase) getBlockType()).setActive(true, world, pos); + ((BlockMachineBase) world.getBlockState(pos).getBlock()).setActive(true, world, pos); onStatusHoldTicks = 400; } }