diff options
| author | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2019-10-11 18:14:07 +0100 |
|---|---|---|
| committer | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2019-10-11 18:14:07 +0100 |
| commit | 4a2fa070a2ae91173cf15785c63b4090016323d4 (patch) | |
| tree | 7a07b317b7b66778869f321da82f95dfee70107f /src/Java/gtPlusPlus/xmod/galacticraft/handler | |
| parent | 8ca23d37495647bda859bc1821c2551cf8b21bf3 (diff) | |
| download | GT5-Unofficial-4a2fa070a2ae91173cf15785c63b4090016323d4.tar.gz GT5-Unofficial-4a2fa070a2ae91173cf15785c63b4090016323d4.tar.bz2 GT5-Unofficial-4a2fa070a2ae91173cf15785c63b4090016323d4.zip | |
$ Fixed many tiny bugs, found by static code analysis.
$ Fixed Canning handling further.
$ Adjusted the Charcoal Pit fix.
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/galacticraft/handler')
| -rw-r--r-- | src/Java/gtPlusPlus/xmod/galacticraft/handler/HandlerTooltip_GC.java | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/Java/gtPlusPlus/xmod/galacticraft/handler/HandlerTooltip_GC.java b/src/Java/gtPlusPlus/xmod/galacticraft/handler/HandlerTooltip_GC.java index 64f1cfbe23..3b59b58cab 100644 --- a/src/Java/gtPlusPlus/xmod/galacticraft/handler/HandlerTooltip_GC.java +++ b/src/Java/gtPlusPlus/xmod/galacticraft/handler/HandlerTooltip_GC.java @@ -21,6 +21,10 @@ public class HandlerTooltip_GC { private static Class<?> oMainClass; private static Class<?> oFuelLoaderClass; private static HashMap <Integer, String> mFuelNames; + + static { + mFuelNames = new LinkedHashMap<Integer, String>(); + } @SubscribeEvent public void onItemTooltip(ItemTooltipEvent event) { @@ -38,7 +42,7 @@ public class HandlerTooltip_GC { oFuelLoaderClass = GCFuelLoader; } - Field aField = ReflectionUtils.getField(GCBlocks, "fuelLoader"); + Field aField = ReflectionUtils.getField(oMainClass, "fuelLoader"); if (aField != null) { Block aBlock = (Block) aField.get(null); if (aBlock != null) { @@ -49,10 +53,12 @@ public class HandlerTooltip_GC { } } catch (Throwable t) { } - } + } + if (mFuelNames == null) { + mFuelNames = new LinkedHashMap<Integer, String>(); + } - if (mFuelNames == null || mFuelNames.isEmpty()) { - mFuelNames = new LinkedHashMap<Integer, String>(); + if (mFuelNames.isEmpty()) { for (int aMapKey : RocketFuels.mValidRocketFuels.keySet()) { Fluid aFuel = RocketFuels.mValidRocketFuels.get(aMapKey); if (aFuel != null) { |