From 4f4c46fe4e2f69395251d25abd986590c9403eac Mon Sep 17 00:00:00 2001 From: Steffion Date: Mon, 12 Aug 2013 20:46:38 +0200 Subject: [PATCH] * Fixed bug timer stops and game stops working on reload/create etc. --- src/nl/Steffion/BlockHunt/BlockHunt.java | 4 ++-- src/nl/Steffion/BlockHunt/Commands/CMDcreate.java | 5 ++++- src/nl/Steffion/BlockHunt/Commands/CMDreload.java | 4 ++++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/nl/Steffion/BlockHunt/BlockHunt.java b/src/nl/Steffion/BlockHunt/BlockHunt.java index f570d64..0e204fe 100644 --- a/src/nl/Steffion/BlockHunt/BlockHunt.java +++ b/src/nl/Steffion/BlockHunt/BlockHunt.java @@ -527,8 +527,8 @@ public class BlockHunt extends JavaPlugin implements Listener { } public void onDisable() { - for (Player player : Bukkit.getOnlinePlayers()) { - ArenaHandler.playerLeaveArena(player, false, true); + for (Arena arena : W.arenaList) { + ArenaHandler.stopArena(arena); } MessageM.sendFMessage(null, ConfigC.log_Disabled, true, "name-" diff --git a/src/nl/Steffion/BlockHunt/Commands/CMDcreate.java b/src/nl/Steffion/BlockHunt/Commands/CMDcreate.java index 85e5854..0dc8449 100644 --- a/src/nl/Steffion/BlockHunt/Commands/CMDcreate.java +++ b/src/nl/Steffion/BlockHunt/Commands/CMDcreate.java @@ -43,7 +43,10 @@ public class CMDcreate extends DefaultCMD { W.arenas.getFile().set(args[1], arena); W.arenas.save(); W.arenas.load(); - + W.signs.load(); + for (Arena arena2 : W.arenaList) { + ArenaHandler.stopArena(arena2); + } ArenaHandler.loadArenas(); MessageM.sendFMessage(player, diff --git a/src/nl/Steffion/BlockHunt/Commands/CMDreload.java b/src/nl/Steffion/BlockHunt/Commands/CMDreload.java index 9696440..6a1e560 100644 --- a/src/nl/Steffion/BlockHunt/Commands/CMDreload.java +++ b/src/nl/Steffion/BlockHunt/Commands/CMDreload.java @@ -1,5 +1,6 @@ package nl.Steffion.BlockHunt.Commands; +import nl.Steffion.BlockHunt.Arena; import nl.Steffion.BlockHunt.ArenaHandler; import nl.Steffion.BlockHunt.W; import nl.Steffion.BlockHunt.Managers.ConfigC; @@ -20,6 +21,9 @@ public class CMDreload extends DefaultCMD { W.messages.load(); W.arenas.load(); W.signs.load(); + for (Arena arena : W.arenaList) { + ArenaHandler.stopArena(arena); + } ArenaHandler.loadArenas(); W.newFiles(); MessageM.sendFMessage(player, ConfigC.normal_reloadedConfigs, true);