aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/xmod/gregtech/common
diff options
context:
space:
mode:
authorJordan Byrne <draknyte1@hotmail.com>2018-02-26 17:14:29 +1000
committerJordan Byrne <draknyte1@hotmail.com>2018-02-26 17:14:29 +1000
commitfe89a9835edc5b10a052cd58669b1826f5b57abd (patch)
tree0d9542b0caa05329c5a5a639897fef742ab4b1f9 /src/Java/gtPlusPlus/xmod/gregtech/common
parent41eb02602c8a6d5899b3e375572ee9990a5a752b (diff)
downloadGT5-Unofficial-fe89a9835edc5b10a052cd58669b1826f5b57abd.tar.gz
GT5-Unofficial-fe89a9835edc5b10a052cd58669b1826f5b57abd.tar.bz2
GT5-Unofficial-fe89a9835edc5b10a052cd58669b1826f5b57abd.zip
$ Findbugs Fixes.
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/common')
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/helpers/autocrafter/AC_Helper_Utils.java2
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java5
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityGeneratorArray.java2
3 files changed, 4 insertions, 5 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/autocrafter/AC_Helper_Utils.java b/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/autocrafter/AC_Helper_Utils.java
index 84cf6067d1..695e226a49 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/autocrafter/AC_Helper_Utils.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/helpers/autocrafter/AC_Helper_Utils.java
@@ -49,7 +49,7 @@ public class AC_Helper_Utils {
public final static boolean removeCrafter(GT4Entity_AutoCrafter AC) {
if (!sAutocrafterMap.isEmpty()){
if (sAutocrafterMap.containsValue(AC)){
- sAutocrafterMap.remove(AC);
+ sAutocrafterMap.remove(getIDByCrafter(AC));
return true;
}
}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java
index a727124771..954d81a3fc 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java
@@ -447,11 +447,12 @@ public class GregtechMetaWirelessCharger extends GregtechMetaTileEntity {
}
public double getDistanceBetweenTwoPositions(BlockPos objectA, BlockPos objectB){
- int[] objectArray1 = new int[]{objectA.xPos, objectA.yPos, objectA.zPos};
- int[] objectArray2 = new int[]{objectB.xPos, objectB.yPos, objectB.zPos};
if (objectA == null || objectB == null){
return 0f;
}
+ int[] objectArray1 = new int[]{objectA.xPos, objectA.yPos, objectA.zPos};
+ int[] objectArray2 = new int[]{objectB.xPos, objectB.yPos, objectB.zPos};
+
final double distance = Math.sqrt(
(objectArray2[0]-objectArray1[0])*(objectArray2[0]-objectArray1[0])
+(objectArray2[1]-objectArray1[1])*(objectArray2[1]-objectArray1[1])
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityGeneratorArray.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityGeneratorArray.java
index 6976a7f560..8f210919b6 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityGeneratorArray.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityGeneratorArray.java
@@ -21,8 +21,6 @@ import net.minecraftforge.fluids.FluidStack;
public class GregtechMetaTileEntityGeneratorArray extends GregtechMeta_MultiBlockBase {
- GT_Recipe mLastRecipe;
-
public GregtechMetaTileEntityGeneratorArray(int aID, String aName, String aNameRegional) {
super(aID, aName, aNameRegional);
}