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

fix #2102

Browse source
This commit is contained in:
asiekierka 2014-10-26 19:08:56 +01:00
parent f190377014
commit 7af1f9ed05
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -185,15 +185,15 @@ public final class OilPopulate {
world.setBlock(wellX, baseY, wellZ, BuildCraftCore.springBlock, 1, 3);
}
for (int y = baseY + 1; y <= maxHeight; ++y) {
world.setBlock(wellX, y, wellZ, BuildCraftEnergy.blockOil);
world.setBlock(wellX, y, wellZ, BuildCraftEnergy.blockOil, 0, 3);
}
if (type == GenType.LARGE) {
for (int y = wellY; y <= maxHeight - wellHeight / 2; ++y) {
world.setBlock(wellX + 1, y, wellZ, BuildCraftEnergy.blockOil);
world.setBlock(wellX - 1, y, wellZ, BuildCraftEnergy.blockOil);
world.setBlock(wellX, y, wellZ + 1, BuildCraftEnergy.blockOil);
world.setBlock(wellX, y, wellZ - 1, BuildCraftEnergy.blockOil);
world.setBlock(wellX + 1, y, wellZ, BuildCraftEnergy.blockOil, 0, 3);
world.setBlock(wellX - 1, y, wellZ, BuildCraftEnergy.blockOil, 0, 3);
world.setBlock(wellX, y, wellZ + 1, BuildCraftEnergy.blockOil, 0, 3);
world.setBlock(wellX, y, wellZ - 1, BuildCraftEnergy.blockOil, 0, 3);
}
}

2
common/buildcraft/transport/PipeColoringRecipe.java
View file

@ -51,7 +51,7 @@ public class PipeColoringRecipe implements IRecipe {
if (isBleach && dye != null) {
return null;
} else if ((isBleach || (dye != null && pipeStack.stackSize == 8)) && !hasDifferentPipes) {
} else if (pipeStack != null && (isBleach || (dye != null && pipeStack.stackSize == 8)) && !hasDifferentPipes) {
ItemStack result = pipeStack;
if (dye != null) {
result.setItemDamage(ColorUtils.getColorIDFromDye(dye) + 1);