From dd9503778643a650a8e19ee6750abc31f0f8f06f Mon Sep 17 00:00:00 2001
From: Steffion <stefdegoey@gmail.com>
Date: Mon, 26 Aug 2013 16:17:11 +0200
Subject: [PATCH] * Fixed bug not resetting solid counter.

---
 src/nl/Steffion/BlockHunt/BlockHunt.java                      | 1 +
 .../Steffion/BlockHunt/Listeners/OnPlayerInteractEvent.java   | 3 +--
 src/nl/Steffion/BlockHunt/SolidBlockHandler.java              | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/nl/Steffion/BlockHunt/BlockHunt.java b/src/nl/Steffion/BlockHunt/BlockHunt.java
index 1ec795a..27f7286 100644
--- a/src/nl/Steffion/BlockHunt/BlockHunt.java
+++ b/src/nl/Steffion/BlockHunt/BlockHunt.java
@@ -508,6 +508,7 @@ public class BlockHunt extends JavaPlugin implements Listener {
 											}
 										}
 									} else {
+										block.setAmount(5);
 										if (!W.dcAPI.isDisguised(player)) {
 											SolidBlockHandler
 													.makePlayerUnsolid(player);
diff --git a/src/nl/Steffion/BlockHunt/Listeners/OnPlayerInteractEvent.java b/src/nl/Steffion/BlockHunt/Listeners/OnPlayerInteractEvent.java
index 68197a4..da83aaa 100644
--- a/src/nl/Steffion/BlockHunt/Listeners/OnPlayerInteractEvent.java
+++ b/src/nl/Steffion/BlockHunt/Listeners/OnPlayerInteractEvent.java
@@ -136,8 +136,7 @@ public class OnPlayerInteractEvent implements Listener {
 										0, 0, 0));
 								pl.getWorld().playSound(player.getLocation(),
 										Sound.HURT_FLESH, 1, 1);
-								ItemStack block = pl.getInventory().getItem(8);
-								SolidBlockHandler.makePlayerUnsolid(pl, block);
+								SolidBlockHandler.makePlayerUnsolid(pl);
 							}
 						}
 					}
diff --git a/src/nl/Steffion/BlockHunt/SolidBlockHandler.java b/src/nl/Steffion/BlockHunt/SolidBlockHandler.java
index 41376e8..446d6d3 100644
--- a/src/nl/Steffion/BlockHunt/SolidBlockHandler.java
+++ b/src/nl/Steffion/BlockHunt/SolidBlockHandler.java
@@ -17,12 +17,14 @@ import pgDev.bukkit.DisguiseCraft.disguise.Disguise;
 import pgDev.bukkit.DisguiseCraft.disguise.DisguiseType;
 
 public class SolidBlockHandler {
-	public static void makePlayerUnsolid(Player player, ItemStack block) {
+	public static void makePlayerUnsolid(Player player) {
+		ItemStack block = player.getInventory().getItem(8);
 		Block pBlock = player.getLocation().getBlock();
 
 		if (W.hiddenLoc.get(player) != null) {
 			pBlock = W.hiddenLoc.get(player).getBlock();
 		}
+
 		block.setAmount(5);
 		for (Player pl : Bukkit.getOnlinePlayers()) {
 			if (!pl.equals(player)) {