Merge branch 'BOP-1.8-3.0.x' of https://github.com/Glitchfiend/BiomesOPlenty into BOP-1.8-3.0.x

This commit is contained in:
Adubbz 2015-01-12 19:41:15 +11:00
commit b9244b6032
1 changed files with 5 additions and 5 deletions

View File

@ -16,6 +16,7 @@ import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.BlockPos; import net.minecraft.util.BlockPos;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.EnumParticleTypes;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
@ -59,16 +60,15 @@ public class BlockAsh extends BOPBlock
entity.motionZ *= 0.4D; entity.motionZ *= 0.4D;
} }
/*@Override @Override
public boolean isFireSource(World world, int x, int y, int z, ForgeDirection side) public boolean isFireSource(World world, BlockPos pos, EnumFacing side)
{ {
if (side == ForgeDirection.UP) if (side == EnumFacing.UP)
{ {
return true; return true;
} }
return false; return false;
}*/ }
/*@Override /*@Override
public Item getItemDropped(int metadata, Random random, int fortune) public Item getItemDropped(int metadata, Random random, int fortune)