From d4d7df5bc653ed4c707cff209a375c92901be196 Mon Sep 17 00:00:00 2001 From: Steffion Date: Mon, 12 Aug 2013 20:44:47 +0200 Subject: [PATCH] * Fixed join bug! --- src/nl/Steffion/BlockHunt/ArenaHandler.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/nl/Steffion/BlockHunt/ArenaHandler.java b/src/nl/Steffion/BlockHunt/ArenaHandler.java index 538094b..352f0b5 100644 --- a/src/nl/Steffion/BlockHunt/ArenaHandler.java +++ b/src/nl/Steffion/BlockHunt/ArenaHandler.java @@ -66,7 +66,8 @@ public class ArenaHandler { ConfigC.error_joinNoBlocksSet, true); } else { LocationSerializable zero = new LocationSerializable( - Bukkit.getWorld("world"), 0, 0, 0, 0, 0); + Bukkit.getWorld(player.getWorld().getName() + .toString()), 0, 0, 0, 0, 0); if (arena.lobbyWarp != null && arena.hidersWarp != null && arena.seekersWarp != null) { if (!arena.lobbyWarp.equals(zero) @@ -297,4 +298,15 @@ public class ArenaHandler { arena.seekers.clear(); arena.gameState = ArenaState.WAITING; } + + public static void stopArena(Arena arena) { + ArenaHandler.sendFMessage(arena, ConfigC.warning_arenaStopped, true); + for (Player player : arena.playersInArena) { + playerLeaveArena(player, false, false); + } + + arena.playersInArena.clear(); + arena.seekers.clear(); + arena.gameState = ArenaState.WAITING; + } }