diff options
Diffstat (limited to 'ihl/handpump/BlockWithCoordinates.java')
| -rw-r--r-- | ihl/handpump/BlockWithCoordinates.java | 29 |
1 files changed, 5 insertions, 24 deletions
diff --git a/ihl/handpump/BlockWithCoordinates.java b/ihl/handpump/BlockWithCoordinates.java index 0cdc965..d934b35 100644 --- a/ihl/handpump/BlockWithCoordinates.java +++ b/ihl/handpump/BlockWithCoordinates.java @@ -1,6 +1,5 @@ package ihl.handpump;
-import ihl.IHLMod;
import net.minecraft.block.Block;
import net.minecraft.init.Blocks;
import net.minecraft.world.World;
@@ -27,7 +26,7 @@ public boolean setMetadataOrDestroyBlock(World world, int meta, int maxMeta) {
return world.setBlockToAir(x, y, z);
}
- else if(isWaterBlock() && IHLMod.cccFiniteWater)
+ else if(isWaterBlock())
{
if(world.setBlock(x,y,z,Blocks.flowing_water,meta,3))
{
@@ -36,24 +35,6 @@ public boolean setMetadataOrDestroyBlock(World world, int meta, int maxMeta) }
return false;
}
- else if(isWaterBlock())
- {
- if(world.setBlock(x,y,z,IHLMod.flowing_water,meta,3))
- {
- world.scheduleBlockUpdate(x,y,z,IHLMod.flowing_water,2);
- return true;
- }
- return false;
- }
- else if(isLavaBlock() && world.provider.isHellWorld && !IHLMod.cccFiniteWater)
- {
- if(world.setBlock(x,y,z,IHLMod.flowing_lava,meta,3))
- {
- world.scheduleBlockUpdate(x,y,z,IHLMod.flowing_lava,2);
- return true;
- }
- return false;
- }
else if(isLavaBlock())
{
if(world.setBlock(x,y,z,Blocks.flowing_lava,meta,3))
@@ -71,11 +52,11 @@ public boolean isSameTypeBlock(World world, int x2, int y2, int z2) Block block2 = world.getBlock(x2, y2, z2);
if(isWaterBlock())
{
- return block2==Blocks.water||block2==Blocks.flowing_water||block2==IHLMod.flowing_water;
+ return block2==Blocks.water||block2==Blocks.flowing_water;
}
else if(isLavaBlock())
{
- return block2==Blocks.lava||block2==Blocks.flowing_lava||block2==IHLMod.flowing_lava;
+ return block2==Blocks.lava||block2==Blocks.flowing_lava;
}
else
{
@@ -85,7 +66,7 @@ public boolean isSameTypeBlock(World world, int x2, int y2, int z2) public boolean isWaterBlock()
{
- if(block==Blocks.water||block==Blocks.flowing_water||block==IHLMod.flowing_water)
+ if(block==Blocks.water||block==Blocks.flowing_water)
{
return true;
}
@@ -94,7 +75,7 @@ public boolean isWaterBlock() public boolean isLavaBlock()
{
- if(block==Blocks.lava||block==Blocks.flowing_lava||block==IHLMod.flowing_lava)
+ if(block==Blocks.lava||block==Blocks.flowing_lava)
{
return true;
}
|