1 files changed, 33 insertions, 19 deletions

diff --git a/src/main/java/lance5057/tDefense/finishingAnvil/utilities/ToolCoreTip.java b/src/main/java/lance5057/tDefense/finishingAnvil/utilities/ToolCoreTip.java
index 1948779..7da31f0 100644
--- a/src/main/java/lance5057/tDefense/finishingAnvil/utilities/ToolCoreTip.java
+++ b/src/main/java/lance5057/tDefense/finishingAnvil/utilities/ToolCoreTip.java
@@ -4,42 +4,56 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class ToolCoreTip
-{	
-	String head;
-	String handle;
-	String accessory;
-	String extra;
-	
+{
+	String			head		= "";
+	String			handle		= "";
+	String			accessory	= "";
+	String			extra		= "";
+
 	List<String>	headTT		= new ArrayList<String>();
 	List<String>	accessoryTT	= new ArrayList<String>();
 	List<String>	handleTT	= new ArrayList<String>();
 	List<String>	extraTT		= new ArrayList<String>();
-	
+
 	public ToolCoreTip()
 	{
 	}
-	
+
 	public String getPart(int id /*1-4*/)
 	{
 		switch(id)
 		{
-			case 1: return head;
-			case 2: return handle;
-			case 3: return accessory;
-			case 4: return extra;
-			default: return "";
+			case 1:
+				return head;
+			case 2:
+				return handle;
+			case 3:
+				return accessory;
+			case 4:
+				return extra;
+			default:
+				return "";
 		}
 	}
-	
+
 	public String getPartName(int partId /*1-4*/, int id)
 	{
 		switch(partId)
 		{
-			case 1: return headTT.get(id);
-			case 2: return handleTT.get(id);
-			case 3: return accessoryTT.get(id);
-			case 4: return extraTT.get(id);
-			default: return "";
+			case 1:
+				if(headTT.size() > 0 && headTT.size() >= id - 1 && headTT.get(id) != null)
+					return headTT.get(id);
+			case 2:
+				if(handleTT.size() > 0 && handleTT.size() >= id - 1 && handleTT.get(id) != null)
+					return handleTT.get(id);
+			case 3:
+				if(accessoryTT.size() > 0 && accessoryTT.size() >= id - 1 && accessoryTT.get(id) != null)
+					return accessoryTT.get(id);
+			case 4:
+				if(extraTT.size() > 0 && extraTT.size() >= id - 1 && extraTT.get(id) != null)
+					return extraTT.get(id);
+			default:
+				return "";
 		}
 	}
 }