Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fixes to emerald pipe NBT handling

Browse source
This commit is contained in:
Adrian 2015-05-07 20:13:07 +02:00
parent 42115042c0
commit 9808a7986e
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
common/buildcraft/transport/pipes/PipeFluidsEmerald.java
View file

@ -16,7 +16,6 @@ import net.minecraft.inventory.IInventory;
import net.minecraft.item.Item;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.IFluidHandler;
@ -47,13 +46,13 @@ public class PipeFluidsEmerald extends PipeFluidsWood implements ISerializable {
@Override
public int extractFluid(IFluidHandler fluidHandler, ForgeDirection side) {
Fluid targetFluid = FluidUtils.getFluidFromItemStack(filters.getStackInSlot(0));
if (targetFluid == null) {
FluidStack targetFluidStack = FluidUtils.getFluidStackFromItemStack(filters.getStackInSlot(0));
if (targetFluidStack == null) {
return super.extractFluid(fluidHandler, side);
}
int flowRate = transport.getFlowRate();
FluidStack toExtract = new FluidStack(targetFluid, liquidToExtract > flowRate ? flowRate : liquidToExtract);
FluidStack toExtract = new FluidStack(targetFluidStack, liquidToExtract > flowRate ? flowRate : liquidToExtract);
FluidStack extracted = fluidHandler.drain(side.getOpposite(), toExtract, false);
if (extracted != null) {

4
common/buildcraft/transport/pipes/PipeFluidsWood.java
View file

@ -108,8 +108,8 @@ public class PipeFluidsWood extends Pipe<PipeTransportFluids> implements IEnergy
FluidTankInfo tankInfo = transport.getTankInfo(side)[0];
FluidStack extracted;
if (tankInfo.fluid != null && tankInfo.fluid.getFluid() != null) {
extracted = fluidHandler.drain(side.getOpposite(), new FluidStack(tankInfo.fluid.getFluid(), amount), false);
if (tankInfo.fluid != null && tankInfo.fluid != null) {
extracted = fluidHandler.drain(side.getOpposite(), new FluidStack(tankInfo.fluid, amount), false);
} else {
extracted = fluidHandler.drain(side.getOpposite(), amount, false);
}