From 0f754e1c383f4283545107ff1849754f0637ada1 Mon Sep 17 00:00:00 2001 From: Frank van der Heijden Date: Sun, 4 Oct 2020 15:32:31 +0200 Subject: [PATCH] Move upgrade message to the updater --- .../common/tasks/UpdateCheckerTask.java | 3 --- .../src/main/resources/ServerUtilsUpdater.jar | Bin 7046 -> 7419 bytes 2 files changed, 3 deletions(-) diff --git a/Common/src/main/java/net/frankheijden/serverutils/common/tasks/UpdateCheckerTask.java b/Common/src/main/java/net/frankheijden/serverutils/common/tasks/UpdateCheckerTask.java index f94e30c..fde8c1b 100644 --- a/Common/src/main/java/net/frankheijden/serverutils/common/tasks/UpdateCheckerTask.java +++ b/Common/src/main/java/net/frankheijden/serverutils/common/tasks/UpdateCheckerTask.java @@ -43,7 +43,6 @@ public class UpdateCheckerTask implements Runnable { private static final String UPDATE_AVAILABLE = "ServerUtils %s is available!"; private static final String DOWNLOAD_START = "Started downloading from \"%s\"..."; private static final String DOWNLOAD_ERROR = "Error downloading a new version of ServerUtils"; - private static final String UPGRADE_SUCCESS = "Successfully upgraded ServerUtils to v%s!"; private static final String DOWNLOADED_RESTART = "Downloaded ServerUtils version v%s. Restarting plugin now..."; private static final String UP_TO_DATE = "We are up-to-date!"; @@ -206,8 +205,6 @@ public class UpdateCheckerTask implements Runnable { plugin.getPluginManager().unloadPlugin((Object)ServerUtilsApp.getPlatformPlugin()).tryClose(); updater.update(pluginFile); file.delete(); - - plugin.getLogger().info(String.format(UPGRADE_SUCCESS, downloadedVersion)); } else { broadcastDownloadStatus(downloadedVersion, false); } diff --git a/Common/src/main/resources/ServerUtilsUpdater.jar b/Common/src/main/resources/ServerUtilsUpdater.jar index ca1546d8f2f46d6a8bb1d56f675bdfc05067bb49..da53b26c1568da7e895c97dd908f8dea0a319bf7 100644 GIT binary patch delta 5882 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 delta 5439 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