From 3643627b7d40925dd6ea123c7fba66b2131b835e Mon Sep 17 00:00:00 2001
From: graywolf336 <graywolf336@craftyn.com>
Date: Mon, 9 Dec 2013 12:54:51 -0600
Subject: [PATCH] Let's check for the wand and not just a wooden sword.

---
 .../com/graywolf336/jail/steps/CellCreationSteps.java | 10 ++++++----
 .../com/graywolf336/jail/steps/JailCreationSteps.java | 11 ++++++-----
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/graywolf336/jail/steps/CellCreationSteps.java b/src/main/java/com/graywolf336/jail/steps/CellCreationSteps.java
index 0c45b46..98b3a3e 100644
--- a/src/main/java/com/graywolf336/jail/steps/CellCreationSteps.java
+++ b/src/main/java/com/graywolf336/jail/steps/CellCreationSteps.java
@@ -5,6 +5,7 @@ import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
 import org.bukkit.util.Vector;
 
 import com.graywolf336.jail.JailManager;
@@ -29,14 +30,15 @@ public class CellCreationSteps {
 		player.sendMessage(ChatColor.GREEN + "First, you must select a teleport point for the cell! Move to the teleport point and then click anywhere with your wooden sword to set it.");
 		player.sendMessage(ChatColor.AQUA + "----------------------------------------");
 		
-		if(player.getInventory().contains(Material.WOOD_SWORD)) {
-			int i = player.getInventory().first(Util.getWand());
+		ItemStack wand = Util.getWand();
+		if(player.getInventory().contains(wand)) {
+			int i = player.getInventory().first(wand);
 			if(i != -1) {
 				player.getInventory().setItem(i, player.getItemInHand());
-				player.setItemInHand(Util.getWand());
+				player.setItemInHand(wand);
 			}
 		}else {
-			player.getInventory().addItem(Util.getWand());
+			player.getInventory().addItem(wand);
 		}
 	}
 	
diff --git a/src/main/java/com/graywolf336/jail/steps/JailCreationSteps.java b/src/main/java/com/graywolf336/jail/steps/JailCreationSteps.java
index bb8893b..3095473 100644
--- a/src/main/java/com/graywolf336/jail/steps/JailCreationSteps.java
+++ b/src/main/java/com/graywolf336/jail/steps/JailCreationSteps.java
@@ -2,8 +2,8 @@ package com.graywolf336.jail.steps;
 
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
-import org.bukkit.Material;
 import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
 import org.bukkit.util.Vector;
 
 import com.graywolf336.jail.JailManager;
@@ -26,14 +26,15 @@ public class JailCreationSteps {
 		player.sendMessage(ChatColor.GREEN + "First, you must select jail cuboid. Select the first point of the cuboid by right clicking on the block with your wooden sword. DO NOT FORGET TO MARK THE FLOOR AND CEILING TOO!");
 		player.sendMessage(ChatColor.AQUA + "--------------------------------------");
 		
-		if(player.getInventory().contains(Material.WOOD_SWORD)) {
-			int i = player.getInventory().first(Util.getWand());
+		ItemStack wand = Util.getWand();
+		if(player.getInventory().contains(wand)) {
+			int i = player.getInventory().first(wand);
 			if(i != -1) {
 				player.getInventory().setItem(i, player.getItemInHand());
-				player.setItemInHand(Util.getWand());
+				player.setItemInHand(wand);
 			}
 		}else {
-			player.getInventory().addItem(Util.getWand());
+			player.getInventory().addItem(wand);
 		}
 	}