diff --git a/src/main/java/de/fanta/challenges/Challenges.java b/src/main/java/de/fanta/challenges/Challenges.java index 89390b6..a8ab1cf 100644 --- a/src/main/java/de/fanta/challenges/Challenges.java +++ b/src/main/java/de/fanta/challenges/Challenges.java @@ -55,6 +55,7 @@ public NMSUtils nmsUtils; public String texturepacklink = null; public int resetTaskId = -1; + public boolean reset = false; private String PREFIX; private String GUIPREFIX; private File backpackConfigFile; @@ -214,13 +215,14 @@ } } + if (plugin.getServerType() == ServerType.ADVENTURE || plugin.getServerType() == ServerType.CHALLENGE_LOAD) { + startResetTask(); + } + Bukkit.getScheduler().scheduleSyncDelayedTask(this, () -> { EventRegistration.pM.callEvent(new ServerStatusChangedEvent(true)); EventRegistration.pM.callEvent(new TimerChangedEvent(timer.isRunning())); EventRegistration.pM.callEvent(new PlayerCountChangedEvent(Bukkit.getOnlinePlayers().size() - plugin.getVanish().countVanishPlayers())); - if (plugin.getServerType() == ServerType.ADVENTURE || plugin.getServerType() == ServerType.CHALLENGE_LOAD) { - startResetTask(); - } }, 200L); getLogger().info("Plugin loaded!"); } @@ -413,12 +415,14 @@ public void startResetTask() { getLogger().info("Start Reset Task"); resetTaskId = Bukkit.getScheduler().scheduleSyncDelayedTask(plugin, () -> Bukkit.dispatchCommand(Bukkit.getConsoleSender(), "reset confirm"), 3 * 60 * 20); + reset = true; } public void stopResetTask() { getLogger().info("Stop Reset Task"); Bukkit.getScheduler().cancelTask(resetTaskId); resetTaskId = -1; + reset = false; } public void delteTexturePack() { diff --git a/src/main/java/de/fanta/challenges/listeners/QuitJoinListener.java b/src/main/java/de/fanta/challenges/listeners/QuitJoinListener.java index 629fe80..2103285 100644 --- a/src/main/java/de/fanta/challenges/listeners/QuitJoinListener.java +++ b/src/main/java/de/fanta/challenges/listeners/QuitJoinListener.java @@ -26,7 +26,7 @@ public void onPlayerJoin(PlayerJoinEvent e) { Player p = e.getPlayer(); - if (plugin.resetTaskId > 0) { + if (plugin.reset) { plugin.stopResetTask(); }