Merge pull request #1187 from srs-bsns/7.0.x/fixfluids

Initialize fluid hardness to match vanilla fluids
This commit is contained in:
Adubbz 2018-02-21 18:46:50 +11:00 committed by GitHub
commit 2b22653e8d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 0 deletions

View file

@ -27,6 +27,7 @@ public class BlockBloodFluid extends BlockFluidClassic
{ {
super(fluid, Material.WATER); super(fluid, Material.WATER);
this.setLightOpacity(3); this.setLightOpacity(3);
this.setHardness(100.0F);
} }
@Override @Override

View file

@ -33,6 +33,7 @@ public class BlockHoneyFluid extends BlockFluidFinite
this.setLightOpacity(1); this.setLightOpacity(1);
// default state should be a 'full block' of honey // default state should be a 'full block' of honey
this.setDefaultState(this.blockState.getBaseState().withProperty(LEVEL, this.quantaPerBlock - 1)); this.setDefaultState(this.blockState.getBaseState().withProperty(LEVEL, this.quantaPerBlock - 1));
this.setHardness(100.0F);
} }
@Override @Override

View file

@ -37,6 +37,7 @@ public class BlockHotSpringWaterFluid extends BlockFluidClassic
{ {
super(fluid, Material.WATER); super(fluid, Material.WATER);
this.setLightOpacity(3); this.setLightOpacity(3);
this.setHardness(100.0F);
} }
@Override @Override

View file

@ -32,6 +32,7 @@ public class BlockPoisonFluid extends BlockFluidClassic
super(fluid, Material.WATER); super(fluid, Material.WATER);
this.setLightOpacity(3); this.setLightOpacity(3);
this.quantaPerBlock = 4; this.quantaPerBlock = 4;
this.setHardness(100.0F);
} }
@Override @Override

View file

@ -32,6 +32,7 @@ public class BlockQuicksandFluid extends BlockFluidClassic
this.quantaPerBlock = 3; this.quantaPerBlock = 3;
this.setLightOpacity(255); this.setLightOpacity(255);
this.renderLayer = BlockRenderLayer.SOLID; this.renderLayer = BlockRenderLayer.SOLID;
this.setHardness(0.5F);// match the hardness of vanilla sand
} }
@Override @Override