From 60b9e2b720abca8908a1ac2a7f5767af08bccaf9 Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Mon, 8 Apr 2019 14:12:52 +1000
Subject: % Allowed Skookum Choocher as a valid Wrench and Hard Hammer. $ Fixed
 infinite loop between TE and Block functions.

---
 src/Java/gtPlusPlus/core/util/minecraft/ItemUtils.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/Java/gtPlusPlus/core/util')

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;
-- 
cgit