2 files changed, 5 insertions, 19 deletions
diff --git a/src/main/java/common/tileentities/GTMTE_SpaceElevator.java b/src/main/java/common/tileentities/GTMTE_SpaceElevator.java
index 49ea5963a3..24d941b39b 100644
--- a/src/main/java/common/tileentities/GTMTE_SpaceElevator.java
+++ b/src/main/java/common/tileentities/GTMTE_SpaceElevator.java
@@ -12,7 +12,6 @@ import gregtech.api.objects.GT_RenderedTexture;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraftforge.common.util.ForgeDirection;
@@ -238,20 +237,6 @@ public class GTMTE_SpaceElevator extends GT_MetaTileEntity_MultiBlockBase {
     }
 
     @Override
-    public void saveNBTData(NBTTagCompound nbt) {
-        nbt = (nbt == null) ? new NBTTagCompound() : nbt;
-
-        super.saveNBTData(nbt);
-    }
-
-    @Override
-    public void loadNBTData(NBTTagCompound nbt) {
-        nbt = (nbt == null) ? new NBTTagCompound() : nbt;
-
-        super.loadNBTData(nbt);
-    }
-
-    @Override
     public boolean isGivingInformation() {
         return true;
     }
diff --git a/src/main/java/common/tileentities/TE_TFFTMultiHatch.java b/src/main/java/common/tileentities/TE_TFFTMultiHatch.java
index c4f9451478..d387e4968d 100644
--- a/src/main/java/common/tileentities/TE_TFFTMultiHatch.java
+++ b/src/main/java/common/tileentities/TE_TFFTMultiHatch.java
@@ -16,7 +16,7 @@ import net.minecraftforge.fluids.IFluidHandler;
 
 public class TE_TFFTMultiHatch extends TileEntity implements IFluidHandler {
 	
-	private static final int OUTPUT_PER_SECOND = 1000; // L/s
+	public static final int BASE_OUTPUT_PER_SECOND = 2000; // L/s
 	
 	private MultiFluidHandler mfh;
 	private int tickCounter = 0;
@@ -50,12 +50,13 @@ public class TE_TFFTMultiHatch extends TileEntity implements IFluidHandler {
 			final TileEntity t = this.getWorldObj().getTileEntity(
 					this.xCoord + d.offsetX, 
 					this.yCoord + d.offsetY, 
-					this.zCoord + d.offsetZ);
+					this.zCoord + d.offsetZ
+			);
 			
 			if(t instanceof IFluidHandler) {
 				
 				final IFluidHandler fh = (IFluidHandler) t;
-				
+				final int meta = t.getWorldObj().getBlockMetadata(t.xCoord, t.yCoord, t.zCoord);
 				// Cycle through fluids
 				final Iterator<FluidStack> volumes = mfh.getFluids().iterator();
 				while(volumes.hasNext()) {
@@ -69,7 +70,7 @@ public class TE_TFFTMultiHatch extends TileEntity implements IFluidHandler {
 						
 						// Test how much can be output
 						final FluidStack copy = volume.copy();
-						copy.amount = Math.min(copy.amount, OUTPUT_PER_SECOND);
+						copy.amount = (int) Math.min(copy.amount, BASE_OUTPUT_PER_SECOND * Math.pow(10, meta));
 												
 						// How much is drawn
 						copy.amount = mfh.pullFluid(copy, false);