aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity
diff options
context:
space:
mode:
authorAlkalus <3060479+draknyte1@users.noreply.github.com>2019-12-30 00:42:09 +0000
committerAlkalus <3060479+draknyte1@users.noreply.github.com>2019-12-30 00:42:09 +0000
commit2f52d6e587f2a39d676c0f042fb93ca88be1f2c8 (patch)
treeb3c825e08637d186d6f89678383680de155667c2 /src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity
parent3f621510092078d8b7de66d29661f1a779b326b5 (diff)
downloadGT5-Unofficial-2f52d6e587f2a39d676c0f042fb93ca88be1f2c8.tar.gz
GT5-Unofficial-2f52d6e587f2a39d676c0f042fb93ca88be1f2c8.tar.bz2
GT5-Unofficial-2f52d6e587f2a39d676c0f042fb93ca88be1f2c8.zip
% Adjusted Build Script, renamed some libs. (Soon to be available via Maven)
$ Fixed Multis not working.
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity')
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
index 03b8768240..3869adb7ab 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
@@ -101,6 +101,8 @@ public abstract class GregtechMeta_MultiBlockBase extends GT_MetaTileEntity_Mult
calculatePollutionReduction = GT_MetaTileEntity_Hatch_Muffler.class.getDeclaredMethod("calculatePollutionReduction", int.class);
} catch (NoSuchMethodException | SecurityException e) {}
+ mCustomBehviours = new HashMap<String, SpecialMultiBehaviour>();
+
}
//Find Recipe Methods
@@ -119,7 +121,7 @@ public abstract class GregtechMeta_MultiBlockBase extends GT_MetaTileEntity_Mult
public ArrayList<GT_MetaTileEntity_Hatch_OutputBattery> mDischargeHatches = new ArrayList<GT_MetaTileEntity_Hatch_OutputBattery>();
// Custom Behaviour Map
- HashMap<String, SpecialMultiBehaviour> mCustomBehviours;
+ private static final HashMap<String, SpecialMultiBehaviour> mCustomBehviours;
public GregtechMeta_MultiBlockBase(final int aID, final String aName,
@@ -1022,8 +1024,8 @@ public abstract class GregtechMeta_MultiBlockBase extends GT_MetaTileEntity_Mult
*/
// First populate the map if we need to.
- if (mCustomBehviours.isEmpty()) {
- mCustomBehviours = Multiblock_API.getSpecialBehaviourItemMap();
+ if (mCustomBehviours == null || mCustomBehviours.isEmpty()) {
+ mCustomBehviours.putAll(Multiblock_API.getSpecialBehaviourItemMap());
}
// We have a special slot object in the recipe