From c766b02838862b405b51a3f9b59d2188938449c6 Mon Sep 17 00:00:00 2001 From: Yive Date: Wed, 27 Jan 2016 23:07:57 -0800 Subject: [PATCH] Removal of Autoinstall & Autorestart Could possibly cause fatal issues for servers who might accidentally enable these in the kcauldron config. --- src/main/java/kcauldron/KCauldronConfig.java | 6 ------ src/main/java/kcauldron/updater/DefaultUpdateCallback.java | 6 ------ 2 files changed, 12 deletions(-) diff --git a/src/main/java/kcauldron/KCauldronConfig.java b/src/main/java/kcauldron/KCauldronConfig.java index 6654028..1ad33be 100644 --- a/src/main/java/kcauldron/KCauldronConfig.java +++ b/src/main/java/kcauldron/KCauldronConfig.java @@ -15,10 +15,6 @@ public class KCauldronConfig extends ConfigBase { "updatechecker.enable", false, "Enable KCauldron update checker"); public StringSetting updatecheckerSymlinks = new StringSetting(this, "updatechecker.symlinks", "KCauldron.jar", "(Re)create symlinks after update"); - public BoolSetting updatecheckerAutoinstall = new BoolSetting(this, - "updatechecker.autoinstall", false, "Install updates without confirming"); - public BoolSetting updatecheckerAutorestart = new BoolSetting(this, - "updatechecker.autorestart", false, "Restart server after updating without confirming (set restart script in spigot.yml)"); public BoolSetting updatecheckerQuiet = new BoolSetting(this, "updatechecker.quiet", false, "Print less info during update"); @@ -35,8 +31,6 @@ public class KCauldronConfig extends ConfigBase { register(commandEnable); register(updatecheckerEnable); register(updatecheckerSymlinks); - register(updatecheckerAutoinstall); - register(updatecheckerAutorestart); register(updatecheckerQuiet); register(loggingMaterialInjection); register(loggingClientModList); diff --git a/src/main/java/kcauldron/updater/DefaultUpdateCallback.java b/src/main/java/kcauldron/updater/DefaultUpdateCallback.java index 5452dea..23aea89 100644 --- a/src/main/java/kcauldron/updater/DefaultUpdateCallback.java +++ b/src/main/java/kcauldron/updater/DefaultUpdateCallback.java @@ -69,12 +69,6 @@ public class DefaultUpdateCallback implements IVersionCheckCallback { } } mHasUpdate = true; - if (MinecraftServer.kcauldronConfig.updatecheckerAutoinstall.getValue() - && !mNewVersion.equals(KCauldron.sNewServerVersion) - && !KCauldron.sUpdateInProgress) { - Bukkit.getConsoleSender().sendMessage("Triggering auto update"); - KCauldronUpdater.initUpdate(Bukkit.getConsoleSender(), newVersion); - } } @Override