From ab5b5deb237a6d58948a58b0a7e2ed400df18f63 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Wed, 8 Mar 2017 19:01:43 -0500 Subject: [PATCH] Several Tesla fixes --- src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java | 2 +- src/main/java/mekanism/common/util/CableUtils.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java b/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java index 777c8fade..3842678f3 100644 --- a/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java +++ b/src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java @@ -258,7 +258,7 @@ public abstract class EnergyAcceptorWrapper implements IStrictEnergyAcceptor @Override public boolean needsEnergy(EnumFacing side) { - return false; + return canReceiveEnergy(side); } public long toTesla(double joules) diff --git a/src/main/java/mekanism/common/util/CableUtils.java b/src/main/java/mekanism/common/util/CableUtils.java index fdda1306f..804417a76 100644 --- a/src/main/java/mekanism/common/util/CableUtils.java +++ b/src/main/java/mekanism/common/util/CableUtils.java @@ -255,7 +255,7 @@ public final class CableUtils else if(CapabilityUtils.hasCapability(tileEntity, Capabilities.TESLA_CONSUMER_CAPABILITY, side.getOpposite())) { ITeslaConsumer consumer = CapabilityUtils.getCapability(tileEntity, Capabilities.TESLA_CONSUMER_CAPABILITY, side.getOpposite()); - sent += consumer.givePower((long)Math.round(currentSending*general.TO_TESLA), false); + sent += consumer.givePower((long)Math.round(currentSending*general.TO_TESLA), false)*general.FROM_TESLA; } else if(MekanismUtils.useRF() && tileEntity instanceof IEnergyReceiver) {