From 16bb4a89022ad54e3f05a174e211836508389a32 Mon Sep 17 00:00:00 2001 From: TheWhiteWolves Date: Tue, 30 Jun 2015 22:33:37 +0100 Subject: [PATCH] Fix mana pump voiding mana taken from a cart when the receiving pool is full --- .../vazkii/botania/common/entity/EntityPoolMinecart.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java index 1c5c260d8..0c7723975 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(-transfer); + pool.recieveMana(-actualTransfer); setMana(cartMana + actualTransfer); did = true; } @@ -109,10 +109,12 @@ 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(transfer); - setMana(cartMana - transfer); + pool.recieveMana(actualTransfer); + setMana(cartMana - actualTransfer); did = true; } }