From 3bfea0a004dedb96773300b0bae7a5c54962ad21 Mon Sep 17 00:00:00 2001 From: Pyrbu Date: Sat, 30 Dec 2023 20:35:33 +0100 Subject: [PATCH] fix update checker shutdown errors --- plugin/src/main/java/lol/pyr/znpcsplus/ZNpcsPlus.java | 2 +- .../main/java/lol/pyr/znpcsplus/updater/UpdateChecker.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/ZNpcsPlus.java b/plugin/src/main/java/lol/pyr/znpcsplus/ZNpcsPlus.java index e2d7490..248e587 100644 --- a/plugin/src/main/java/lol/pyr/znpcsplus/ZNpcsPlus.java +++ b/plugin/src/main/java/lol/pyr/znpcsplus/ZNpcsPlus.java @@ -149,7 +149,7 @@ public class ZNpcsPlus { if (configManager.getConfig().checkForUpdates()) { UpdateChecker updateChecker = new UpdateChecker(getDescription()); scheduler.runDelayedTimerAsync(updateChecker, 5L, 6000L); - shutdownTasks.add(updateChecker::cancel); + shutdownTasks.add(updateChecker::shutdown); pluginManager.registerEvents(new UpdateNotificationListener(this, adventure, updateChecker, scheduler), bootstrap); } diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/updater/UpdateChecker.java b/plugin/src/main/java/lol/pyr/znpcsplus/updater/UpdateChecker.java index c84202f..f3d3474 100644 --- a/plugin/src/main/java/lol/pyr/znpcsplus/updater/UpdateChecker.java +++ b/plugin/src/main/java/lol/pyr/znpcsplus/updater/UpdateChecker.java @@ -40,6 +40,10 @@ public class UpdateChecker extends BukkitRunnable { logger.warning("Download it at " + UpdateChecker.DOWNLOAD_LINK); } + public void shutdown() { + if (getTaskId() != -1) cancel(); + } + private int versionToNumber(String version) { int num = Integer.parseInt(version.replaceAll("[^0-9]", "")); if (version.toLowerCase().contains("snapshot")) num -= 1;