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

Some minor cleanup

Browse source
This commit is contained in:
CovertJaguar 2013-10-05 06:18:01 -07:00
parent b6cb556274
commit de8da4c008
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/buildcraft/core/EntityRobot.java
View file

@ -213,12 +213,12 @@ public class EntityRobot extends Entity implements IEntityAdditionalSpawnData {
if (target.mode == Mode.ClearIfInvalid) { if (target.mode == Mode.ClearIfInvalid) {
if (!target.isValid(a.context)) { if (!target.isValid(a.context)) {
worldObj.setBlock(target.x, target.y, target.z, 0, 0,3); worldObj.setBlockToAir(target.x, target.y, target.z);
} }
} else if (target.stackToUse != null) { } else if (target.stackToUse != null) {
worldObj.setBlock(target.x, target.y, target.z, 0); worldObj.setBlockToAir(target.x, target.y, target.z);
throw new RuntimeException("NOT IMPLEMENTED"); throw new RuntimeException("NOT IMPLEMENTED");
// target.stackToUse.getItem().onItemUse(target.stackToUse, // target.stackToUse.getItem().onItemUse(target.stackToUse,
// CoreProxy.getBuildCraftPlayer(worldObj), worldObj, target.x, target.y - 1, // CoreProxy.getBuildCraftPlayer(worldObj), worldObj, target.x, target.y - 1,

12
common/buildcraft/core/utils/BlockUtil.java
View file

@ -74,14 +74,14 @@ public class BlockUtil {
return canChangeBlock(world.getBlockId(x, y, z), world, x, y, z); return canChangeBlock(world.getBlockId(x, y, z), world, x, y, z);
} }
public static boolean isAnObstructingBlock(int blockID, World world, int x, int y, int z) public static boolean isAnObstructingBlock(int blockID, World world, int x, int y, int z) {
{ Block block = Block.blocksList[blockID];
Block block = Block.blocksList[blockID];
if (blockID == 0 || block == null || block.isAirBlock(world, x, y, z)) if (blockID == 0 || block == null || block.isAirBlock(world, x, y, z))
return false; return false;
return true; return true;
} }
public static boolean canChangeBlock(int blockID, World world, int x, int y, int z) { public static boolean canChangeBlock(int blockID, World world, int x, int y, int z) {
Block block = Block.blocksList[blockID]; Block block = Block.blocksList[blockID];

2
common/buildcraft/factory/TileQuarry.java
View file

@ -434,7 +434,7 @@ public class TileQuarry extends TileBuildCraft implements IMachine, IPowerRecept
} }
worldObj.playAuxSFXAtEntity(null, 2001, i, j, k, blockId + (worldObj.getBlockMetadata(i, j, k) << 12)); worldObj.playAuxSFXAtEntity(null, 2001, i, j, k, blockId + (worldObj.getBlockMetadata(i, j, k) << 12));
worldObj.setBlock(i, j, k, 0); worldObj.setBlockToAir(i, j, k);
} }
// Collect any lost items laying around // Collect any lost items laying around