From f4d19ab3cef893c497ed9edc17230fb95b1458d7 Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Mon, 12 Jul 2021 19:58:02 +1200 Subject: [PATCH] Don't update on errory start if they asked not to update on errory start --- .../java/me/libraryaddict/disguise/DisguiseConfig.java | 10 +++++++++- .../java/me/libraryaddict/disguise/LibsDisguises.java | 4 ++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/main/java/me/libraryaddict/disguise/DisguiseConfig.java b/src/main/java/me/libraryaddict/disguise/DisguiseConfig.java index 837e73ba..e354e47f 100644 --- a/src/main/java/me/libraryaddict/disguise/DisguiseConfig.java +++ b/src/main/java/me/libraryaddict/disguise/DisguiseConfig.java @@ -217,7 +217,7 @@ public class DisguiseConfig { @Getter private static String savedServerIp = ""; @Getter - private static boolean autoUpdate; + private static Boolean autoUpdate; @Getter private static boolean notifyUpdate; private static BukkitTask updaterTask; @@ -279,6 +279,14 @@ public class DisguiseConfig { return getPlayerNameType() == PlayerNameType.EXTENDED; } + public static boolean isAutoUpdate() { + if (getAutoUpdate() == null) { + autoUpdate = LibsDisguises.getInstance().getConfig().getBoolean("AutoUpdate"); + } + + return getAutoUpdate(); + } + public static void setAutoUpdate(boolean update) { if (isAutoUpdate() == update) { return; diff --git a/src/main/java/me/libraryaddict/disguise/LibsDisguises.java b/src/main/java/me/libraryaddict/disguise/LibsDisguises.java index 221027b4..c4c9bdce 100644 --- a/src/main/java/me/libraryaddict/disguise/LibsDisguises.java +++ b/src/main/java/me/libraryaddict/disguise/LibsDisguises.java @@ -105,7 +105,7 @@ public class LibsDisguises extends JavaPlugin { } } catch (Throwable throwable) { try { - if (isNumberedBuild()) { + if (isNumberedBuild() && DisguiseConfig.isAutoUpdate()) { getUpdateChecker().doUpdate(); } } catch (Throwable t) { @@ -260,7 +260,7 @@ public class LibsDisguises extends JavaPlugin { new MetricsInitalizer(); } catch (Throwable throwable) { try { - if (isNumberedBuild()) { + if (isNumberedBuild() && DisguiseConfig.isAutoUpdate()) { getUpdateChecker().doUpdate(); } } catch (Throwable t) {