From b1e31a12182dcbddbdaa5f54b070f65ace98e3bb Mon Sep 17 00:00:00 2001 From: drPepper <skype:drpepper_mc> Date: Sat, 26 Jul 2014 18:55:58 +0400 Subject: [PATCH] nerfocircus --- src/cr0s/WarpDrive/TileEntityShipScanner.java | 4 ++-- src/cr0s/WarpDrive/WarpDriveConfig.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cr0s/WarpDrive/TileEntityShipScanner.java b/src/cr0s/WarpDrive/TileEntityShipScanner.java index 428ba25b..8a8096f0 100644 --- a/src/cr0s/WarpDrive/TileEntityShipScanner.java +++ b/src/cr0s/WarpDrive/TileEntityShipScanner.java @@ -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]; diff --git a/src/cr0s/WarpDrive/WarpDriveConfig.java b/src/cr0s/WarpDrive/WarpDriveConfig.java index ac8813c4..50f7d2fd 100644 --- a/src/cr0s/WarpDrive/WarpDriveConfig.java +++ b/src/cr0s/WarpDrive/WarpDriveConfig.java @@ -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)