From 78c811542df493f62c83fbae75562f1ef3dcb116 Mon Sep 17 00:00:00 2001
From: Waverunner <lewaverunner@gmail.com>
Date: Fri, 12 Dec 2014 12:12:36 -0500
Subject: [PATCH] Updated calls to Race, Hair is no longer created with an
 empty hair template

---
 src/services/objects/ObjectManager.java |  6 ------
 src/services/player/LoginService.java   |  2 +-
 src/services/player/ZoneService.java    | 14 ++++++++------
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/services/objects/ObjectManager.java b/src/services/objects/ObjectManager.java
index 606c5dc2..98c3cb4c 100644
--- a/src/services/objects/ObjectManager.java
+++ b/src/services/objects/ObjectManager.java
@@ -222,12 +222,6 @@ public class ObjectManager extends Manager {
 	}
 	
 	private TangibleObject createTangibleObject(long objectId, String template) {
-		if (!template.startsWith("tangible/"))
-			return null;
-		template = template.substring(9);
-		switch (getFirstTemplatePart(template)) {
-			
-		}
 		return new TangibleObject(objectId);
 	}
 	
diff --git a/src/services/player/LoginService.java b/src/services/player/LoginService.java
index cfa0da2b..354955df 100644
--- a/src/services/player/LoginService.java
+++ b/src/services/player/LoginService.java
@@ -179,7 +179,7 @@ public class LoginService extends Service {
 			SWGCharacter c = new SWGCharacter();
 			c.setId(set.getInt("id"));
 			c.setName(set.getString("name"));
-			c.setRaceCrc(Race.getRace(set.getString("race")).getCrc());
+			c.setRaceCrc(Race.getRaceByFile(set.getString("race")).getCrc());
 			c.setGalaxyId(set.getInt("galaxyid"));
 			c.setType(1); // 1 = Normal (2 = Jedi, 3 = Spectral)
 			characters.add(c);
diff --git a/src/services/player/ZoneService.java b/src/services/player/ZoneService.java
index 1f5dda3d..4ab898b6 100644
--- a/src/services/player/ZoneService.java
+++ b/src/services/player/ZoneService.java
@@ -100,7 +100,7 @@ public class ZoneService extends Service {
 	
 	private void handleRandomNameRequest(Player player, RandomNameRequest request) {
 		RandomNameResponse response = new RandomNameResponse(request.getRace(), "");
-		String race = Race.getRace(request.getRace()).getIFF().split("_")[0];
+		String race = Race.getRaceByFile(request.getRace()).getSpecies();
 		response.setRandomName(nameGenerator.generateRandomName(race));
 		sendPacket(player.getNetworkId(), response);
 	}
@@ -138,17 +138,19 @@ public class ZoneService extends Service {
 	
 	private long createCharacter(ObjectManager objManager, Player player, ClientCreateCharacter create) {
 		Location start = getStartLocation(create.getStart());
-		Race race = Race.getRace(create.getRace());
+		Race race = Race.getRaceByFile(create.getRace());
 		CreatureObject creatureObj = (CreatureObject) objManager.createObject(race.getFilename());
 		creatureObj.setVolume(0x000F4240);
 		PlayerObject playerObj     = (PlayerObject)   objManager.createObject("object/player/shared_player.iff");
-		TangibleObject hairObj     = (TangibleObject) objManager.createObject(create.getHair());
 		//WeaponObject defaultWeap   = (WeaponObject) objManager.createObject("object/weapon/melee/unarmed/shared_unarmed_default_player.iff");
 		setCreatureObjectValues(creatureObj, create);
 		setPlayerObjectValues(playerObj, create);
-		hairObj.setAppearanceData(create.getHairCustomization());
 		creatureObj.addChild(playerObj);
-		creatureObj.addChild(hairObj);
+		if (!create.getHair().isEmpty()) {
+			TangibleObject hairObj     = (TangibleObject) objManager.createObject(create.getHair());
+			hairObj.setAppearanceData(create.getHairCustomization());
+			creatureObj.addChild(hairObj);
+		}
 		creatureObj.setLocation(start);
 		playerObj.setLocation(start);
 		player.setCreatureObject(creatureObj);
@@ -157,7 +159,7 @@ public class ZoneService extends Service {
 	}
 	
 	private void setCreatureObjectValues(CreatureObject creatureObj, ClientCreateCharacter create) {
-		creatureObj.setRace(Race.getRace(create.getRace()));
+		creatureObj.setRace(Race.getRaceByFile(create.getRace()));
 		creatureObj.setAppearanceData(create.getCharCustomization());
 		creatureObj.setHeight(create.getHeight());
 		creatureObj.setName(create.getName());