nerfocircus
This commit is contained in:
parent
3c63085eef
commit
b1e31a1218
2 changed files with 3 additions and 3 deletions
src/cr0s/WarpDrive
|
@ -473,7 +473,7 @@ public class TileEntityShipScanner extends TileEntity implements IEnergySink,
|
||||||
}
|
}
|
||||||
|
|
||||||
private boolean isEnoughEnergyForDeploy(int size) {
|
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" ]
|
// Returns result array for CC interface: [ code, "message" ]
|
||||||
|
@ -525,7 +525,7 @@ public class TileEntityShipScanner extends TileEntity implements IEnergySink,
|
||||||
}
|
}
|
||||||
|
|
||||||
// Consume energy
|
// Consume energy
|
||||||
currentEnergyValue = Math.abs(currentEnergyValue - size * EU_PER_BLOCK_DEPLOY);
|
currentEnergyValue = 0;
|
||||||
|
|
||||||
// Set deployment vars
|
// Set deployment vars
|
||||||
this.blocksToDeploy = new JumpBlock[size];
|
this.blocksToDeploy = new JumpBlock[size];
|
||||||
|
|
|
@ -427,7 +427,7 @@ public class WarpDriveConfig
|
||||||
z = Class.forName("icbm.explosion.ICBMExplosion");
|
z = Class.forName("icbm.explosion.ICBMExplosion");
|
||||||
ICBM_Machine = ((Block)z.getField("blockMachine").get(null)).blockID;
|
ICBM_Machine = ((Block)z.getField("blockMachine").get(null)).blockID;
|
||||||
ICBM_Missile = ((Item)z.getField("itemMissile").get(null)).itemID;
|
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);
|
scannerIgnoreBlocks.add(ICBM_Explosive);
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
|
|
Loading…
Reference in a new issue