From 0cfa32159aa2acf15732f04bb68c3af9255e63b2 Mon Sep 17 00:00:00 2001 From: Seth <13510767+ZeroEpoch1969@users.noreply.github.com> Date: Tue, 7 Jul 2020 01:14:07 -0700 Subject: [PATCH] Guess I have to modify this after all --- .gitignore | 3 +++ .../libraryaddict/disguise/DisguiseConfig.java | 17 ++--------------- .../utilities/updates/UpdateChecker.java | 3 --- src/main/resources/internal.yml | 4 +--- 4 files changed, 6 insertions(+), 21 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..395dde97 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +*.iml +.idea/ +target/ \ No newline at end of file diff --git a/src/main/java/me/libraryaddict/disguise/DisguiseConfig.java b/src/main/java/me/libraryaddict/disguise/DisguiseConfig.java index 66d853d6..c9fade9c 100644 --- a/src/main/java/me/libraryaddict/disguise/DisguiseConfig.java +++ b/src/main/java/me/libraryaddict/disguise/DisguiseConfig.java @@ -253,9 +253,6 @@ public class DisguiseConfig { @Getter @Setter private static boolean saveUserPreferences; - @Getter - @Setter - private static long lastUpdateRequest; public static boolean isArmorstandsName() { return getPlayerNameType() == PlayerNameType.ARMORSTANDS; @@ -314,20 +311,12 @@ public class DisguiseConfig { return; } - long timeSinceLast = System.currentTimeMillis() - (getLastUpdateRequest() + TimeUnit.HOURS.toMillis(6)); - - if (timeSinceLast > 0) { - timeSinceLast /= 50; - } else { - timeSinceLast = 0; - } - updaterTask = Bukkit.getScheduler().runTaskTimerAsynchronously(LibsDisguises.getInstance(), new Runnable() { @Override public void run() { LibsDisguises.getInstance().getUpdateChecker().doAutoUpdateCheck(); } - }, timeSinceLast, (20 * TimeUnit.HOURS.toSeconds(6))); // Check every 6 hours + }, 0, (20 * TimeUnit.HOURS.toSeconds(6))); // Check every 6 hours } public static void setUsingReleaseBuilds(boolean useReleaseBuilds) { @@ -361,7 +350,6 @@ public class DisguiseConfig { bisectHosted = configuration.getBoolean("Bisect-Hosted", isBisectHosted()); savedServerIp = configuration.getString("Server-IP", getSavedServerIp()); usingReleaseBuild = configuration.getBoolean("ReleaseBuild", isUsingReleaseBuild()); - lastUpdateRequest = configuration.getLong("LastUpdateRequest", 0L); if (!configuration.contains("Bisect-Hosted") || !configuration.contains("Server-IP") || !configuration.contains("ReleaseBuild")) { @@ -376,8 +364,7 @@ public class DisguiseConfig { .getResourceAsString(LibsDisguises.getInstance().getFile(), "internal.yml"); // Bisect hosted, server ip, release builds - for (Object s : new Object[]{isBisectHosted(), getSavedServerIp(), isUsingReleaseBuild(), - getLastUpdateRequest()}) { + for (Object s : new Object[]{isBisectHosted(), getSavedServerIp(), isUsingReleaseBuild()}) { internalConfig = internalConfig.replaceFirst("%data%", "" + s); } diff --git a/src/main/java/me/libraryaddict/disguise/utilities/updates/UpdateChecker.java b/src/main/java/me/libraryaddict/disguise/utilities/updates/UpdateChecker.java index 5096e1cd..cd1c738c 100644 --- a/src/main/java/me/libraryaddict/disguise/utilities/updates/UpdateChecker.java +++ b/src/main/java/me/libraryaddict/disguise/utilities/updates/UpdateChecker.java @@ -156,9 +156,6 @@ public class UpdateChecker { } public LibsMsg doUpdateCheck() { - DisguiseConfig.setLastUpdateRequest(System.currentTimeMillis()); - DisguiseConfig.saveInternalConfig(); - downloading.set(true); try { diff --git a/src/main/resources/internal.yml b/src/main/resources/internal.yml index 612ad827..e6e97553 100644 --- a/src/main/resources/internal.yml +++ b/src/main/resources/internal.yml @@ -5,6 +5,4 @@ Bisect-Hosted: %data% Server-IP: %data% # Should the plugin be doing release or dev builds updating? -ReleaseBuild: %data% -# Make sure the plugin aint spamming update requests -LastUpdateCheck: %data% \ No newline at end of file +ReleaseBuild: %data% \ No newline at end of file