Skip to content

Commit cf1375b

Browse files
committed
Ensure we have the right block when determing if a block can receive power
- Fixes #19
1 parent e850a90 commit cf1375b

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

src/main/java/dev/aura/powermoney/common/capability/EnergyConsumer.java

+10-6
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import buildcraft.api.mj.IMjReceiver;
55
import com.google.common.collect.ImmutableMap;
66
import dev.aura.powermoney.PowerMoney;
7+
import dev.aura.powermoney.PowerMoneyBlocks;
78
import dev.aura.powermoney.common.block.BlockPowerReceiver;
89
import dev.aura.powermoney.common.compat.PowerMoneyModules;
910
import dev.aura.powermoney.common.compat.buildcraft.BuildcraftCompat;
@@ -17,6 +18,7 @@
1718
import lombok.RequiredArgsConstructor;
1819
import lombok.Value;
1920
import net.darkhax.tesla.api.ITeslaConsumer;
21+
import net.minecraft.block.state.IBlockState;
2022
import net.minecraft.util.EnumFacing;
2123
import net.minecraftforge.common.capabilities.Capability;
2224
import net.minecraftforge.common.capabilities.ICapabilityProvider;
@@ -109,12 +111,14 @@ public boolean canExtract() {
109111

110112
@Override
111113
public boolean canReceive() {
112-
return ((owner != null) && !TileEntityPowerReceiver.UUID_NOBODY.equals(owner))
113-
&& PowerMoney.getInstance().getActiveMoneyInterface().canAcceptMoney()
114-
&& worldPos
115-
.getWorld()
116-
.getBlockState(worldPos.getPos())
117-
.getValue(BlockPowerReceiver.RECEIVING);
114+
if (((owner == null) || TileEntityPowerReceiver.UUID_NOBODY.equals(owner))
115+
|| !PowerMoney.getInstance().getActiveMoneyInterface().canAcceptMoney()) return false;
116+
117+
IBlockState blockState = worldPos.getWorld().getBlockState(worldPos.getPos());
118+
119+
return (blockState.getBlock() == PowerMoneyBlocks.powerReceiver())
120+
&& blockState.getPropertyKeys().contains(BlockPowerReceiver.RECEIVING)
121+
&& blockState.getValue(BlockPowerReceiver.RECEIVING);
118122
}
119123

120124
private long addEnergy(long energy, boolean simulate) {

0 commit comments

Comments
 (0)