From d636e99f0e37890d1bea59552b90e8ed7f284470 Mon Sep 17 00:00:00 2001 From: TheWhiteWolves Date: Thu, 2 Jul 2015 11:46:17 +0100 Subject: [PATCH] Revert 16bb4a89022ad54e3f05a174e211836508389a32 because I'm a derp and shouldn't code during a heat wave after being at work for over 10 hours. --- .../vazkii/botania/common/entity/EntityPoolMinecart.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java index 0c7723975..1c5c260d8 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java @@ -101,7 +101,7 @@ public class EntityPoolMinecart extends EntityMinecart { int transfer = Math.min(TRANSFER_RATE, poolMana); int actualTransfer = Math.min(TilePool.MAX_MANA - cartMana, transfer); if(actualTransfer > 0) { - pool.recieveMana(-actualTransfer); + pool.recieveMana(-transfer); setMana(cartMana + actualTransfer); did = true; } @@ -109,12 +109,10 @@ public class EntityPoolMinecart extends EntityMinecart { can = true; if(!pool.isFull()) { int cartMana = getMana(); - int poolMana = pool.getCurrentMana(); int transfer = Math.min(TRANSFER_RATE, cartMana); - int actualTransfer = Math.min(TilePool.MAX_MANA - poolMana, transfer); if(transfer > 0) { - pool.recieveMana(actualTransfer); - setMana(cartMana - actualTransfer); + pool.recieveMana(transfer); + setMana(cartMana - transfer); did = true; } }