Anvilcraft/buildcraft
2
1
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fix #3497

Browse source
This commit is contained in:
Adrian Siekierka 2017-04-08 10:01:59 +02:00
parent 9417e8a59b
commit bfa69a2ef3
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
common/buildcraft/core/lib/block/BlockBuildCraftFluid.java
View file

@ -64,12 +64,17 @@ public class BlockBuildCraftFluid extends BlockFluidClassic {
iconRegister.registerIcon(prefix + fluidName + "_flow")};
}
public static boolean isFluidExplosive(World world, int x, int z) {
return world.provider.dimensionId == -1;
}
@Override
public void onNeighborBlockChange(World world, int x, int y, int z, Block block) {
super.onNeighborBlockChange(world, x, y, z, block);
if (flammable && world.provider.dimensionId == -1) {
public void updateTick(World world, int x, int y, int z, Random rand) {
if (flammable && isFluidExplosive(world, x, z)) {
world.setBlock(x, y, z, Blocks.air, 0, 2); // Do not cause block updates!
world.newExplosion(null, x, y, z, 4F, true, true);
} else {
super.updateTick(world, x, y, z, rand);
}
}

4
common/buildcraft/energy/worldgen/OilPopulate.java
View file

@ -12,6 +12,7 @@ import java.util.HashSet;
import java.util.Random;
import java.util.Set;
import buildcraft.core.lib.block.BlockBuildCraftFluid;
import net.minecraft.block.Block;
import net.minecraft.block.BlockFlower;
import net.minecraft.block.BlockStaticLiquid;
@ -65,7 +66,6 @@ public final class OilPopulate {
}
public void generateOil(World world, Random rand, int chunkX, int chunkZ) {
// shift to world coordinates
int x = chunkX * 16 + 8 + rand.nextInt(16);
int z = chunkZ * 16 + 8 + rand.nextInt(16);
@ -73,7 +73,7 @@ public final class OilPopulate {
BiomeGenBase biome = world.getBiomeGenForCoords(x, z);
// Do not generate oil in the End or Nether
if (excludedBiomes.contains(biome.biomeID)) {
if (excludedBiomes.contains(biome.biomeID) || BlockBuildCraftFluid.isFluidExplosive(world, x, z)) {
return;
}