From fcd155e1006d28407bcd849ae22eb1da12081951 Mon Sep 17 00:00:00 2001
From: Seefo <rezen1911@gmail.com>
Date: Tue, 6 May 2014 17:20:51 -0400
Subject: [PATCH] Fixed TangibleObject.getTrueName()

---
 .../objects/tangible/TangibleObject.java      | 35 ++++++++++++++-----
 1 file changed, 27 insertions(+), 8 deletions(-)

diff --git a/src/resources/objects/tangible/TangibleObject.java b/src/resources/objects/tangible/TangibleObject.java
index 9ed60956..1e8b58b7 100644
--- a/src/resources/objects/tangible/TangibleObject.java
+++ b/src/resources/objects/tangible/TangibleObject.java
@@ -51,7 +51,9 @@ import com.sleepycat.persist.model.NotPersistent;
 import com.sleepycat.persist.model.Persistent;
 
 import engine.clientdata.ClientFileManager;
+import engine.clientdata.StfTable;
 import engine.clients.Client;
+import engine.resources.common.CRC;
 import engine.resources.objects.SWGObject;
 import engine.resources.scene.Planet;
 import engine.resources.scene.Point3D;
@@ -512,24 +514,41 @@ public class TangibleObject extends SWGObject implements Serializable {
 		}
 	}
 	
-	// Returns the STF-based name
+	// Returns the full STF-based name filepath
 	public String getProperName()
 	{
 		return  "@" + getStfFilename() + ":" + getStfName();
 	}
 	
-	// Returns the current, true name of the Object
-	public String getTrueName()
-	{
-		return getCustomName() != null ? getCustomName() : getProperName();
-	}
-	
-	// Returns the STF-based description
+	// Returns the STF-based description filepath
 	public String getProperDescription()
 	{
 		return "@" + getDetailFilename() + ":" + getDetailName();
 	}
 	
+	// Returns the current, true name of the Object
+	public String getTrueName()
+	{
+		return getCustomName() != null ? getCustomName() : getTrueStfName();
+	}
+		
+	// Returns the true STF-based name
+	public String getTrueStfName()
+	{
+		String name = null;
+		try
+		{
+			StfTable stf = new StfTable("clientdata/string/en/" + getStfFilename() + ".stf");
+			for (int s = 1; s < stf.getRowCount(); s++) 
+			{		
+				if(stf.getStringById(s).getKey().equals(getStfName())) name = stf.getStringById(s).getValue();
+			}
+        } 
+		catch (Exception e) { }
+		
+		return name;	
+	}
+	
 	public List<LootGroup> getLootGroups() {
 		return lootGroups;
 	}