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.

---
 .../gtPlusPlus/core/block/general/redstone/BlockGenericRedstone.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/src/Java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstone.java b/src/Java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstone.java
index 65d89c0577..b84c96be99 100644
--- a/src/Java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstone.java
+++ b/src/Java/gtPlusPlus/core/block/general/redstone/BlockGenericRedstone.java
@@ -86,7 +86,7 @@ public abstract class BlockGenericRedstone extends BlockContainer {
 		try {
 			final ItemStack mHandStack = PlayerUtils.getItemStackInPlayersHand(world, player.getDisplayName());
 			final Item mHandItem = mHandStack.getItem();
-			if (mHandItem instanceof GT_MetaGenerated_Tool_01) {
+			if (ItemUtils.isItemGregtechTool(mHandStack)) {
 
 				Logger.INFO("Found Tool in players hand!");
 				
@@ -250,7 +250,7 @@ public abstract class BlockGenericRedstone extends BlockContainer {
 		if (aThis != null) {
 			return aThis.shouldCheckWeakPower(world, x, y, z, side);
 		}
-		return false;
+        return isNormalCube();
 	}
 
 	@Override
-- 
cgit