nerfocircus

This commit is contained in:
drPepper 2014-07-26 18:55:58 +04:00
parent 3c63085eef
commit b1e31a1218
2 changed files with 3 additions and 3 deletions

View file

@ -473,7 +473,7 @@ public class TileEntityShipScanner extends TileEntity implements IEnergySink,
}
private boolean isEnoughEnergyForDeploy(int size) {
return size * EU_PER_BLOCK_DEPLOY <= currentEnergyValue;
return MAX_ENERGY_VALUE <= currentEnergyValue;
}
// Returns result array for CC interface: [ code, "message" ]
@ -525,7 +525,7 @@ public class TileEntityShipScanner extends TileEntity implements IEnergySink,
}
// Consume energy
currentEnergyValue = Math.abs(currentEnergyValue - size * EU_PER_BLOCK_DEPLOY);
currentEnergyValue = 0;
// Set deployment vars
this.blocksToDeploy = new JumpBlock[size];

View file

@ -427,7 +427,7 @@ public class WarpDriveConfig
z = Class.forName("icbm.explosion.ICBMExplosion");
ICBM_Machine = ((Block)z.getField("blockMachine").get(null)).blockID;
ICBM_Missile = ((Item)z.getField("itemMissile").get(null)).itemID;
ICBM_Explosive = ((Item)z.getField("blockExplosive").get(null)).itemID;
ICBM_Explosive = ((Block)z.getField("blockExplosive").get(null)).blockID;
scannerIgnoreBlocks.add(ICBM_Explosive);
}
catch (Exception e)