mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-18 03:25:18 +00:00
Merge remote-tracking branch 'origin/1.8'
This commit is contained in:
commit
c374ba5463
458 files changed
+13442
-14297
No files matched your search
@@ -6,9 +6,9 @@ import net.minecraft.tileentity.TileEntity;
|
||||
|
||||
/**
|
||||
* Reference implementation of {@link IFluidTank}. Use/extend this or implement your own.
|
||||
*
|
||||
*
|
||||
* @author King Lemming, cpw (LiquidTank)
|
||||
*
|
||||
*
|
||||
*/
|
||||
public class FluidTank implements IFluidTank
|
||||
{
|
||||
@@ -127,7 +127,7 @@ public class FluidTank implements IFluidTank
|
||||
|
||||
if (tile != null)
|
||||
{
|
||||
FluidEvent.fireEvent(new FluidEvent.FluidFillingEvent(fluid, tile.getWorldObj(), tile.xCoord, tile.yCoord, tile.zCoord, this, fluid.amount));
|
||||
FluidEvent.fireEvent(new FluidEvent.FluidFillingEvent(fluid, tile.getWorld(), tile.getPos(), this, fluid.amount));
|
||||
}
|
||||
return fluid.amount;
|
||||
}
|
||||
@@ -150,7 +150,7 @@ public class FluidTank implements IFluidTank
|
||||
|
||||
if (tile != null)
|
||||
{
|
||||
FluidEvent.fireEvent(new FluidEvent.FluidFillingEvent(fluid, tile.getWorldObj(), tile.xCoord, tile.yCoord, tile.zCoord, this, filled));
|
||||
FluidEvent.fireEvent(new FluidEvent.FluidFillingEvent(fluid, tile.getWorld(), tile.getPos(), this, filled));
|
||||
}
|
||||
return filled;
|
||||
}
|
||||
@@ -180,7 +180,7 @@ public class FluidTank implements IFluidTank
|
||||
|
||||
if (tile != null)
|
||||
{
|
||||
FluidEvent.fireEvent(new FluidEvent.FluidDrainingEvent(fluid, tile.getWorldObj(), tile.xCoord, tile.yCoord, tile.zCoord, this, drained));
|
||||
FluidEvent.fireEvent(new FluidEvent.FluidDrainingEvent(fluid, tile.getWorld(), tile.getPos(), this, drained));
|
||||
}
|
||||
}
|
||||
return stack;
|
||||
|
||||
Reference in new issue
Block a user