From 262f1dc4f98920fd109b808ca1d2836144797dcc Mon Sep 17 00:00:00 2001
From: graywolf336 <graywolf336@craftyn.com>
Date: Wed, 5 Mar 2014 22:28:12 -0600
Subject: [PATCH] Finish loading cells and check for chest when we are removing
 a cell.

---
 src/main/java/com/graywolf336/jail/JailIO.java  | 17 +++++++++++++----
 .../java/com/graywolf336/jail/beans/Jail.java   | 11 +++++++----
 .../graywolf336/jail/beans/SimpleLocation.java  | 17 +++++++++++++++++
 3 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/graywolf336/jail/JailIO.java b/src/main/java/com/graywolf336/jail/JailIO.java
index c026c8e..3cd61b4 100644
--- a/src/main/java/com/graywolf336/jail/JailIO.java
+++ b/src/main/java/com/graywolf336/jail/JailIO.java
@@ -366,18 +366,27 @@ public class JailIO {
 					PreparedStatement ps = con.prepareStatement("SELECT * FROM " + prefix + "cells");
 					ResultSet set = ps.executeQuery();
 					
-					List<Integer> remove = new LinkedList<Integer>(); //TODO: Set up something to remove these
+					//This list contains an integer which refers to the cellid column in sql
+					//this list only gets populated if there are cells which reference a jail
+					//that doesn't exist anymore
+					//TODO: Implement this
+					List<Integer> remove = new LinkedList<Integer>();
 					
 					while(set.next()) {
 						Jail j = pl.getJailManager().getJail(set.getString("jail"));
 						
 						if(j != null) {
 							Cell c = new Cell(set.getString("name"));
-							c.setTeleport(new SimpleLocation(j.getWorldName(),  set.getDouble("tp.x"),
-									set.getDouble("tp.y"), set.getDouble("tp.z"),
+							c.setTeleport(new SimpleLocation(j.getWorldName(),  set.getDouble("tp.x"), set.getDouble("tp.y"), set.getDouble("tp.z"),
 									set.getFloat("tp.yaw"), set.getFloat("tp.pitch")));
 							
-							//TODO: Finish loading the cells and fix the sql requiring everything, whoops
+							c.setChestLocation(new Location(j.getWorld(), set.getInt("chest.x"), set.getInt("chest.y"), set.getInt("chest.z")));
+							
+							String[] signs = set.getString("signs").split(";");
+							for(String s : signs) {
+								String[] co = s.split(",");
+								c.addSign(new SimpleLocation(co[0], co[1], co[2], co[4]));
+							}
 							
 							j.addCell(c, false);
 						}else {
diff --git a/src/main/java/com/graywolf336/jail/beans/Jail.java b/src/main/java/com/graywolf336/jail/beans/Jail.java
index f2ce632..46d55da 100644
--- a/src/main/java/com/graywolf336/jail/beans/Jail.java
+++ b/src/main/java/com/graywolf336/jail/beans/Jail.java
@@ -160,11 +160,14 @@ public class Jail {
 	
 	/** Removes the cell from the jail. */
 	public void removeCell(String name) {
-		//Clear the chest and reset the sign
-		this.cells.get(name).getChest().getInventory().clear();
+		Cell c = this.cells.get(name);
+		//If we have a chest, clear the inventory
+		if(c.hasChest()) {
+			c.getChest().getInventory().clear();
+		}
 		
 		//For each sign, clear the lines on the sign
-		for(SimpleLocation s : this.cells.get(name).getSigns()) {
+		for(SimpleLocation s : c.getSigns()) {
 			if(s.getLocation().getBlock() instanceof Sign) {
 				Sign sign = (Sign) s.getLocation().getBlock();
 				for(int i = 0; i < 4; i++) {
@@ -174,7 +177,7 @@ public class Jail {
 		}
 		
 		//remove the information from the storage first as it requires an instance
-		plugin.getJailIO().removeCell(this, this.cells.remove(name));
+		plugin.getJailIO().removeCell(this, c);
 		//now remove it from the local storage
 		this.cells.remove(name);
 	}
diff --git a/src/main/java/com/graywolf336/jail/beans/SimpleLocation.java b/src/main/java/com/graywolf336/jail/beans/SimpleLocation.java
index 176d679..43548a5 100644
--- a/src/main/java/com/graywolf336/jail/beans/SimpleLocation.java
+++ b/src/main/java/com/graywolf336/jail/beans/SimpleLocation.java
@@ -49,6 +49,23 @@ public class SimpleLocation {
 		this.pitch = location.getPitch();
 	}
 	
+	/**
+	 * Creates a new Simple Location with all the inputs being in string.
+	 * 
+	 * @param world the name of the world
+	 * @param x coordinate as a string
+	 * @param y coordinate as a string
+	 * @param z coordinate as a string
+	 */
+	public SimpleLocation(String world, String x, String y, String z) {
+		this.world = world;
+		this.x = Double.valueOf(x);
+		this.y = Double.valueOf(y);
+		this.z = Double.valueOf(z);
+		this.yaw = 0;
+		this.pitch = 0;
+	}
+
 	/** Returns the instance from Bukkit of the world this location is in. */
 	public World getWorld() {
 		return Bukkit.getWorld(world);