From 7c062467bc6c34a5e442392cca4018cf725f811f Mon Sep 17 00:00:00 2001 From: Jordan Byrne Date: Tue, 20 Mar 2018 22:09:51 +1000 Subject: $ Fixed another instance of things being cached when invalid. --- src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/Java/gtPlusPlus/core/util/minecraft') diff --git a/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java index ffde242f7d..5eaf84d107 100644 --- a/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java +++ b/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java @@ -266,11 +266,11 @@ public class ItemUtils { mTemp = oredictName.replace("VanadiumSteel", "StainlessSteel"); } //Use Cache - if (mOreDictCache.containsKey(mTemp) && mOreDictCache.get(mTemp) != null) { + if (mOreDictCache.containsKey(mTemp) && mOreDictCache.get(mTemp) != null && mOreDictCache.get(mTemp).getItem() != ModItems.AAA_Broken) { //Logger.INFO("[ODC] Returning mOreDictCache value."); return getCachedValue(mTemp, amount); } - else if (mDustCache.containsKey(oredictName) && mDustCache.get(mTemp) != null) { + else if (mDustCache.containsKey(oredictName) && mDustCache.get(mTemp) != null && mOreDictCache.get(mTemp).getItem() != ModItems.AAA_Broken) { //Logger.INFO("[ODC] Returning mDustCache value."); return getSimpleStack(mDustCache.get(oredictName), amount); } @@ -280,7 +280,9 @@ public class ItemUtils { if (!oreDictList.isEmpty()){ final ItemStack returnValue = oreDictList.get(0).copy(); returnValue.stackSize = amount; - setCachedValue(mTemp, returnValue); + if (returnValue.getItem() != ModItems.AAA_Broken) { + setCachedValue(mTemp, returnValue); + } //Logger.INFO("[ODC] Setting and Returning mOreDictCache value."); return returnValue; } -- cgit