From 29f9f034af1718b92e5cf8dff9d52408eaa954cf Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Tue, 25 Nov 2014 14:07:16 +0800 Subject: [PATCH] #1273 Farming Stations not accepting enough power to keep up --- ReleaseNotes.txt | 1 + .../crazypants/enderio/machine/farm/TileFarmStation.java | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 7affb877..d159e0f4 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -15,6 +15,7 @@ Changes Bugs - Fix outer corners on connected texture blocks not being metadata sensitive when they should be - #1300 Farming Station won't take MFR Rubber trees +- #1273 Farming Stations not accepting enough power to keep up ------------------------------------------------------ diff --git a/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java b/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java index 84ae38e5..68cc17b3 100644 --- a/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java +++ b/src/main/java/crazypants/enderio/machine/farm/TileFarmStation.java @@ -530,15 +530,18 @@ public class TileFarmStation extends AbstractPoweredTaskEntity { int ppt = getPowerUsePerTick(); switch (capacitorType.ordinal()) { case 1: - cap = new BasicCapacitor(ppt * 4, 500000); + cap = new BasicCapacitor(ppt * 40, 500000); break; case 2: - cap = new BasicCapacitor(ppt * 4, 1000000); + cap = new BasicCapacitor(ppt * 40, 1000000); break; default: - cap = new BasicCapacitor(ppt * 4, 250000); + cap = new BasicCapacitor(ppt * 40, 250000); break; } + if(getEnergyStored() > getMaxEnergyStored()) { + setEnergyStored(getMaxEnergyStored()); + } }