Merge branch 'master' into experimental

This commit is contained in:
Bernhard Bonigl committed 2014-12-02 16:18:15 +01:00
commit 007c1a457c
2 files changed
+5 -5

No files matched your search

@@ -57,15 +57,13 @@ public class LavaTankLogic extends MultiServantLogic implements IFluidHandler
@Override
public boolean canFill (ForgeDirection from, Fluid fluid)
{
// return tank.fill(fluid, false) > 0;
return false;
return tank.getFluidAmount() == 0 || tank.getFluidAmount() < tank.getCapacity();
}
@Override
public boolean canDrain (ForgeDirection from, Fluid fluid)
{
// TODO Auto-generated method stub
return false;
return tank.getFluidAmount() > 0;
}
@Override
@@ -60,7 +60,9 @@ public class KingBlueSlime extends SlimeBase implements IBossDisplayData {
double x = Math.cos(r);
double z = Math.sin(r);
entityslime.setLocationAndAngles(this.posX - 1d + x, this.posY + 0.5D, this.posZ - 1d + z, this.rand.nextFloat() * 360.0F, 0.0F);
entityslime.setVelocity(x, -0.5d - rand.nextDouble(), z);
entityslime.motionX = x;
entityslime.motionY = -0.5d - rand.nextDouble();
entityslime.motionZ = z;
this.worldObj.spawnEntityInWorld(entityslime);
}
}