From aa4c8c2c5fb3eed934f05b3872a015435ed84c4a Mon Sep 17 00:00:00 2001
From: DianeXD <64360468+DianeXD@users.noreply.github.com>
Date: Tue, 19 Jul 2022 21:09:12 +0800
Subject: Fix negative saw (#249)

---
 .../multi/production/GregtechMetaTileEntityTreeFarm.java         | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'src/main/java')

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java
index 35d8020ac5..c515369abb 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java
@@ -137,9 +137,13 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase<
 		return "VacuumFreezer";
 	}
 
+	@Override
 	public boolean isCorrectMachinePart(final ItemStack aStack) {
 		// is correct part && either not powered tool or have enough power
-		return TreeFarmHelper.isValidForGUI(aStack) && !GT_ModHandler.isElectricItem(aStack) || GT_ModHandler.canUseElectricItem(aStack, 32);
+		if (TreeFarmHelper.isValidForGUI(aStack) && GT_MetaGenerated_Tool.getToolDamage(aStack) < GT_MetaGenerated_Tool.getToolMaxDamage(aStack)) {
+			return GT_ModHandler.isElectricItem(aStack) ? GT_ModHandler.canUseElectricItem(aStack, 32) : true;
+		}
+		return false;
 	}
 
 	/**
@@ -257,7 +261,8 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase<
 	}
 
 	private boolean tryDamageTool() {
-		return GT_ModHandler.damageOrDechargeItem(this.mInventory[1], 1, 32, null) ? true : replaceTool();
+		GT_ModHandler.damageOrDechargeItem(this.mInventory[1], 1, 32, null);
+		return replaceTool();
 	}
 
 	public boolean replaceTool() {
-- 
cgit