From b5d7019301272a4646870aa1d5d0b6fefe122198 Mon Sep 17 00:00:00 2001
From: Steffion <stefdegoey@gmail.com>
Date: Sun, 11 Aug 2013 12:36:31 +0200
Subject: [PATCH] * Attempt to fix bug still items while no more ingame.

---
 src/nl/Steffion/BlockHunt/ArenaHandler.java | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/nl/Steffion/BlockHunt/ArenaHandler.java b/src/nl/Steffion/BlockHunt/ArenaHandler.java
index fb3a617..538094b 100644
--- a/src/nl/Steffion/BlockHunt/ArenaHandler.java
+++ b/src/nl/Steffion/BlockHunt/ArenaHandler.java
@@ -89,7 +89,10 @@ public class ArenaHandler {
 											player.getLocation());
 									W.pGameMode.put(player,
 											player.getGameMode());
+
+									player.teleport(arena.lobbyWarp);
 									player.setGameMode(GameMode.SURVIVAL);
+
 									W.pInventory.put(player, player
 											.getInventory().getContents());
 									player.getInventory().clear();
@@ -113,7 +116,6 @@ public class ArenaHandler {
 									W.pFood.put(player, player.getFoodLevel());
 									player.setFoodLevel(20);
 
-									player.teleport(arena.lobbyWarp);
 									ArenaHandler.sendFMessage(arena,
 											ConfigC.normal_joinJoinedArena,
 											true,
@@ -202,10 +204,6 @@ public class ArenaHandler {
 				}
 			}
 
-			player.teleport(W.pLocation.get(player));
-			W.pLocation.remove(player);
-			player.setGameMode(W.pGameMode.get(player));
-			W.pGameMode.remove(player);
 			player.getInventory().clear();
 			player.getInventory().setContents(W.pInventory.get(player));
 			player.updateInventory();
@@ -222,6 +220,12 @@ public class ArenaHandler {
 			W.pFood.remove(player);
 			W.pBlock.remove(player);
 
+			player.teleport(W.pLocation.get(player));
+
+			player.setGameMode(W.pGameMode.get(player));
+			W.pGameMode.remove(player);
+			W.pLocation.remove(player);
+
 			for (Player pl : Bukkit.getOnlinePlayers()) {
 				pl.showPlayer(player);
 				if (W.hiddenLoc.get(player) != null) {