From 6200f857ad6477eca6456d74a6d7044208bfb1e1 Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Tue, 14 May 2019 15:58:32 +1000
Subject: + Added new Fireproof Bauble. $ Fixed #479.

---
 .../common/items/behaviours/Behaviour_Electric_Lighter.java   | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'src/Java/gtPlusPlus/xmod/gregtech/common/items/behaviours')

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Electric_Lighter.java b/src/Java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Electric_Lighter.java
index 64676fa907..d772c294b9 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Electric_Lighter.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Electric_Lighter.java
@@ -1,5 +1,6 @@
 package gtPlusPlus.xmod.gregtech.common.items.behaviours;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import codechicken.lib.math.MathHelper;
@@ -191,7 +192,12 @@ public class Behaviour_Electric_Lighter extends Behaviour_None {
 		aList.add(this.mTooltip);
 		int aUses = 0;
 
+		if (aStack == null) {
+			return new ArrayList<String>();
+		}		
+		
 		if (aStack != null) {
+			
 			if (aStack.getItem() instanceof MetaGeneratedGregtechTools) {
 				if (ChargingHelper.isItemValid(aStack)) {
 					if (aStack.getItem() instanceof IElectricItemManager) {
@@ -202,14 +208,14 @@ public class Behaviour_Electric_Lighter extends Behaviour_None {
 					}
 				}
 			}
+			
 		}
 
-		NBTTagCompound tNBT = aStack.getTagCompound();
 		aList.add(this.mTooltipUses + " " + aUses);
 		aList.add(this.mTooltipUnstackable);
 		
 		
-		boolean aCurrentMode; 
+		boolean aCurrentMode; 		
 		if (NBTUtils.hasKey(aStack, "aFireballMode")) {
 			aCurrentMode = NBTUtils.getBoolean(aStack, "aFireballMod");
 		}
@@ -217,6 +223,7 @@ public class Behaviour_Electric_Lighter extends Behaviour_None {
 			aStack.getTagCompound().setBoolean("aFireballMod", false);
 			aCurrentMode = false;
 		}
+		
 		aList.add("Current Mode: "+EnumChatFormatting.RED+(aCurrentMode ? "Projectile" : "Fire Starter"));		
 		return aList;
 	}
-- 
cgit