From 47d2b68b66fb9958b57c3ff81f1e73e8f6afd91b Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Mon, 29 Apr 2019 12:19:35 +1000
Subject: $ Fixed bug when breaking blocks which drop their inventory contents.
 $ Fixed Hardness of Lead Lined Chest. $ Fixed handling of tools/electrics in
 the Tree Farmer. % Updated English Locale.

---
 .../multi/production/GregtechMetaTileEntityTreeFarm.java  | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines')

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java
index 9fb9e3514e..5791cfbf73 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java
@@ -3,6 +3,7 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production;
 import java.util.concurrent.ScheduledExecutorService;
 
 import gregtech.api.GregTech_API;
+import gregtech.api.enums.Materials;
 import gregtech.api.enums.TAE;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.IIconContainer;
@@ -291,23 +292,27 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase
 						long tVoltage = getMaxInputVoltage();
 						byte tTier = (byte) Math.max(1, GT_Utility.getTier(tVoltage));						
 						if (EU.getCharge(invItem) >= tVoltage) {
-							if (EU.discharge(invItem, (int) tVoltage, tTier)) {
+							Logger.WARNING("Can drain.");
+							if (EU.discharge(invItem, (int) tVoltage, -1)) {
+								Logger.WARNING("Drained Power.");
+								didElectricDamage = true;
 							}
 							else {
+								Logger.WARNING("Failed when draining Power.");
 								this.getBaseMetaTileEntity().disableWorking();
 							}
-							didElectricDamage = true;
 						}							
 					}
 				}
+				Logger.WARNING("Drained Power? "+didElectricDamage);
 
 
-				//Logger.INFO("dmg: "+aDmg+" | max: "+aDmgMax);
 
-				if (!didElectricDamage) {
+				if (!didElectricDamage && invItem.getItem() instanceof GT_MetaGenerated_Tool) {
 					long aDmg = GT_MetaGenerated_Tool.getToolDamage(invItem);
 					long aDmgMax = GT_MetaGenerated_Tool.getToolMaxDamage(invItem);
-					if (aDmg < aDmgMax && invItem.isItemStackDamageable()) {
+					if (aDmg < aDmgMax && GT_MetaGenerated_Tool.getPrimaryMaterial(invItem) != Materials._NULL) {
+						Logger.WARNING("dmg: "+aDmg+" | max: "+aDmgMax);
 						GT_MetaGenerated_Tool.setToolDamage(invItem, aDmg+getDamageToComponent(invItem));							
 					}
 					else if (aDmg >= aDmgMax) {
-- 
cgit