aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core/util
diff options
context:
space:
mode:
authorAlkalus <3060479+draknyte1@users.noreply.github.com>2019-04-08 14:12:52 +1000
committerAlkalus <3060479+draknyte1@users.noreply.github.com>2019-04-08 14:12:52 +1000
commit60b9e2b720abca8908a1ac2a7f5767af08bccaf9 (patch)
tree38390f1f6fffe206aea14329cc803424490d0855 /src/Java/gtPlusPlus/core/util
parentaf61708010aef717ecc3537fa115547acb9aa9c7 (diff)
downloadGT5-Unofficial-60b9e2b720abca8908a1ac2a7f5767af08bccaf9.tar.gz
GT5-Unofficial-60b9e2b720abca8908a1ac2a7f5767af08bccaf9.tar.bz2
GT5-Unofficial-60b9e2b720abca8908a1ac2a7f5767af08bccaf9.zip
% Allowed Skookum Choocher as a valid Wrench and Hard Hammer.
$ Fixed infinite loop between TE and Block functions.
Diffstat (limited to 'src/Java/gtPlusPlus/core/util')
-rw-r--r--src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
index 9617d12b66..ae799baa2b 100644
--- a/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
+++ b/src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java
@@ -1122,7 +1122,9 @@ public class ItemUtils {
return false;
}
final Item mItem = aStack.getItem();
- if (mItem instanceof GT_MetaGenerated_Tool_01 || mItem instanceof MetaGeneratedGregtechTools || mItem instanceof Gregtech_MetaTool) {
+ final Item aSkookum = ItemUtils.getItemFromFQRN("miscutils:gt.plusplus.metatool.01");
+ final Class aSkookClass = aSkookum.getClass();
+ if (aSkookClass.isInstance(mItem) || mItem instanceof GT_MetaGenerated_Tool_01 || mItem instanceof MetaGeneratedGregtechTools || mItem instanceof Gregtech_MetaTool || mItem == aSkookum) {
return true;
}
return false;