From 77287cbbcd4bc503d46bd881829fb99e0b1b80ad Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Fri, 24 Mar 2017 11:17:27 -0400 Subject: [PATCH] Check simulation parameters in Tesla integration --- .../java/mekanism/common/integration/TeslaIntegration.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/mekanism/common/integration/TeslaIntegration.java b/src/main/java/mekanism/common/integration/TeslaIntegration.java index 08cbd8a9a..81b730f58 100644 --- a/src/main/java/mekanism/common/integration/TeslaIntegration.java +++ b/src/main/java/mekanism/common/integration/TeslaIntegration.java @@ -45,13 +45,13 @@ public class TeslaIntegration implements ITeslaHolder, ITeslaConsumer, ITeslaPro @Method(modid = "tesla") public long takePower(long power, boolean simulated) { - return (long)Math.round(tileEntity.removeEnergyFromProvider(side, power*general.FROM_TESLA)*general.TO_TESLA); + return (long)(tileEntity.extractEnergy(side, (int)(power*general.FROM_TESLA*general.TO_RF), simulated)*general.FROM_RF*general.TO_TESLA); } @Override @Method(modid = "tesla") public long givePower(long power, boolean simulated) { - return (long)Math.round(tileEntity.transferEnergyToAcceptor(side, power*general.FROM_TESLA)*general.TO_TESLA); + return (long)(tileEntity.receiveEnergy(side, (int)(power*general.FROM_TESLA*general.TO_RF), simulated)*general.FROM_RF*general.TO_TESLA); } }