From d2135a22b4ee3de4a0c433bd3f6c6d3b20b2787f Mon Sep 17 00:00:00 2001
From: dennise1975 <dennis@ecns-stl.com>
Date: Sun, 16 Jul 2017 21:51:24 -0500
Subject: [PATCH] Revert "Changed Race request to enum"

This reverts commit 71fbdf39ab398229261fa134bc51aa2c6e831061.
---
 src/services/galaxy/SkillModService.java | 65 +++++++++++-------------
 1 file changed, 29 insertions(+), 36 deletions(-)

diff --git a/src/services/galaxy/SkillModService.java b/src/services/galaxy/SkillModService.java
index 4faa0c1e1..c69953ef3 100644
--- a/src/services/galaxy/SkillModService.java
+++ b/src/services/galaxy/SkillModService.java
@@ -117,23 +117,23 @@ public class SkillModService extends Service {
 		PlayerObject playerObject = creature.getPlayerObject();
 		String profession = playerObject.getProfession();
 		profession = profession.substring(0,profession.length()-3);			
-		RaceAbbr race = RaceAbbr.valueOf(creature.getRace().toString());
+		String race = getRaceColumnAbbr(creature.getRace().toString());
 		int newLevel = creature.getLevel();
 
 		updateLevelHAMValues(creature, newLevel, profession);
-		updateLevelSkillModValues(creature, newLevel, profession, race.getRaceAbbr());
+		updateLevelSkillModValues(creature, newLevel, profession, race);
 	}
 	
 	private void handleLevelChangedIntent(LevelChangedIntent lci){
 		CreatureObject creature = lci.getCreatureObject();
 		PlayerObject playerObject = creature.getPlayerObject();
 		String profession = playerObject.getProfession();
-		profession = profession.substring(0,profession.length()-3);	
-		RaceAbbr race = RaceAbbr.valueOf(creature.getRace().toString());
+		profession = profession.substring(0,profession.length()-3);		
+		String race = getRaceColumnAbbr(creature.getRace().toString());
 		int newLevel = lci.getNewLevel();
-
+		
 		updateLevelHAMValues(creature, newLevel, profession);
-		updateLevelSkillModValues(creature, newLevel, profession, race.getRaceAbbr());
+		updateLevelSkillModValues(creature, newLevel, profession, race);
 	}
 
 	private void handleSkillModIntent(SkillModIntent smi) {
@@ -261,38 +261,31 @@ public class SkillModService extends Service {
 		}
 	}
 	
-	public enum RaceAbbr {
-
-		HUMAN_MALE  	 		("hum"),
-		HUMAN_FEMALE		 	("hum"),
-		TRANDOSHAN_MALE  		("tran"),
-		TRANDOSHAN_FEMALE		("tran"),
-		TWILEK_MALE  			("twi"),
-		TWILEK_FEMALE			("twi"),
-		BOTHAN_MALE  			("both"),
-		BOTHAN_FEMALE			("both"),
-		ZABRAK_MALE  			("zab"),
-		ZABRAK_FEMALE			("zab"),
-		RODIAN_MALE  			("rod"),
-		RODIAN_FEMALE			("rod"),
-		MONCAL_MALE  			("mon"),
-		MONCAL_FEMALE			("mon"),
-		WOOKIEE_MALE     	    ("wok"),
-		WOOKIEE_FEMALE   	    ("wok"),
-		SULLUSTAN_MALE  	 	("sul"),
-		SULLUSTAN_FEMALE	 	("sul"),
-		ITHORIAN_MALE			("ith"),
-		ITHORIAN_FEMALE 	 	("ith");	
+	private String getRaceColumnAbbr(String race){
 		
-		private final String raceAbbr;
-		
-		RaceAbbr(String race){
-			this.raceAbbr = race;
+		if (race.contains("HUMAN")){
+			return "hum";
+		}else if (race.contains("RODIAN")){
+			return "rod";
+		}else if (race.contains("TRANDOSHAN")){
+			return "tran";
+		}else if (race.contains("MONCAL")){
+			return "mon";
+		}else if (race.contains("WOOKIE")){
+			return "wok";
+		}else if (race.contains("BOTHAN")){
+			return "both";
+		}else if (race.contains("TWILEK")){
+			return "twi";
+		}else if (race.contains("ZABRAK")){
+			return "zab";
+		}else if (race.contains("ITHORIAN")){
+			return "ith";	
+		}else if (race.contains("SULLUSTAN")){
+			return "sul";			
 		}
-		
-		public String getRaceAbbr(){
-			return this.raceAbbr;
-		}		
+
+		return "";
 	}
 	
 	public enum SkillModTypes{