From 073a63f46d35a34fa4e2f4f8635cbfa9a53f2196 Mon Sep 17 00:00:00 2001
From: Obique PSWG <obique.pswg@gmail.com>
Date: Wed, 13 Apr 2016 11:10:31 -0500
Subject: [PATCH] Changed UniformBoxService to use new data format

---
 src/services/CoreManager.java               | 1 -
 src/services/objects/UniformBoxService.java | 7 +++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/services/CoreManager.java b/src/services/CoreManager.java
index bc520ef5..ae008cd3 100644
--- a/src/services/CoreManager.java
+++ b/src/services/CoreManager.java
@@ -47,7 +47,6 @@ import intents.network.OutboundPacketIntent;
 import intents.server.ServerManagementIntent;
 import intents.server.ServerStatusIntent;
 import java.time.OffsetTime;
-import java.time.ZoneOffset;
 import resources.Galaxy;
 import resources.Galaxy.GalaxyStatus;
 import resources.config.ConfigFile;
diff --git a/src/services/objects/UniformBoxService.java b/src/services/objects/UniformBoxService.java
index 1ba57277..3110b455 100644
--- a/src/services/objects/UniformBoxService.java
+++ b/src/services/objects/UniformBoxService.java
@@ -49,7 +49,7 @@ public class UniformBoxService extends Service {
 	//TODO: Display loot box
 	
 	private static final String [] UNIFORM_COLUMNS = {"boots", "pants", "belt", "gloves", "shirt", "vest", "hat", "necklace", "robe", "weapon"};
-	private static final String GET_UNIFORMBOX_SQL = "SELECT * FROM npe_uniformbox where profession = ? AND race = ? AND (gender = ? OR gender = 3)";
+	private static final String GET_UNIFORMBOX_SQL = "SELECT * FROM npe_uniformbox where profession = ? AND race = ?";
 	private static final String UNIFORM_BOX_IFF = "object/tangible/npe/shared_npe_uniform_box.iff";
 	
 	private RelationalServerData uniformBoxDatabase;
@@ -86,15 +86,14 @@ public class UniformBoxService extends Service {
 		String profession = creature.getPlayerObject().getProfession();
 		
 		destroyUniformBox(creature);
-		handleCreateItems(inventory, profession.substring(0, profession.lastIndexOf('_')), creature.getRace());
+		handleCreateItems(inventory, profession, creature.getRace());
 	}
 	
 	private void handleCreateItems(SWGObject inventory, String profession, Race race) {
 		synchronized (getUniformBoxStatement) {
 			try {
 				getUniformBoxStatement.setString(1, profession);
-				getUniformBoxStatement.setString(2, race.getSpecies());
-				getUniformBoxStatement.setInt(3, race.isMale() ? 1 : 2);
+				getUniformBoxStatement.setString(2, race.name());
 				
 				try (ResultSet set = getUniformBoxStatement.executeQuery()) {
 					if (set.next())