zhdev/bukman
1
0
Fork 0
Code Issues Pull requests Releases 1 Activity

Add check in case ServerUtilsUpdater is already present

Browse source
This commit is contained in:
Frank van der Heijden 2021-01-16 17:25:32 +01:00
parent 6ebe0073ea
commit bfb2f3383c
No known key found for this signature in database
GPG key ID: 26DA56488D314D11
1 changed files with 18 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Common/src/main/java/net/frankheijden/serverutils/common/tasks/UpdateCheckerTask.java
View file

@ -10,10 +10,13 @@ import java.net.ConnectException;
import java.net.SocketTimeoutException;
import java.net.UnknownHostException;
import java.util.logging.Level;
import java.util.logging.Logger;
import net.frankheijden.serverutils.common.ServerUtilsApp;
import net.frankheijden.serverutils.common.config.Config;
import net.frankheijden.serverutils.common.config.Messenger;
import net.frankheijden.serverutils.common.config.YamlConfig;
import net.frankheijden.serverutils.common.entities.LoadResult;
import net.frankheijden.serverutils.common.entities.Result;
import net.frankheijden.serverutils.common.entities.ServerCommandSender;
import net.frankheijden.serverutils.common.entities.ServerUtilsPlugin;
import net.frankheijden.serverutils.common.managers.AbstractVersionManager;
@ -82,7 +85,7 @@ public class UpdateCheckerTask implements Runnable {
String downloaded = versionManager.getDownloadedVersion();
String current = versionManager.getCurrentVersion();
if (VersionUtils.isNewVersion(downloaded, githubVersion)) {
if (VersionUtils.isNewVersion(downloaded, githubVersion) || true) {
if (isStartupCheck()) {
plugin.getLogger().info(String.format(UPDATE_AVAILABLE, githubVersion));
plugin.getLogger().info("Release info: " + body);
@ -197,10 +200,21 @@ public class UpdateCheckerTask implements Runnable {
String downloadedVersion = versionManager.getDownloadedVersion();
if (isStartupCheck()) {
plugin.getLogger().info(String.format(DOWNLOADED_RESTART, downloadedVersion));
Logger logger = plugin.getLogger();
logger.info(String.format(DOWNLOADED_RESTART, downloadedVersion));
Updater updater = (Updater) plugin.getPluginManager().loadPlugin(updaterFile).get();
plugin.getPluginManager().enablePlugin(updater);
LoadResult<?> loadResult = plugin.getPluginManager().loadPlugin(updaterFile);
Updater updater = (Updater) plugin.getPluginManager().getPlugin("ServerUtilsUpdater");
if (!loadResult.isSuccess() && updater == null) {
logger.severe("Failed to load ServerUtilsUpdater: " + loadResult.getResult().name());
return;
}
Result result = plugin.getPluginManager().enablePlugin(updater);
if (result != Result.SUCCESS && result != Result.ALREADY_ENABLED) {
logger.severe("Failed to enable ServerUtilsUpdater: " + loadResult.getResult().name());
return;
}
plugin.getPluginManager().disablePlugin(ServerUtilsApp.getPlatformPlugin());
plugin.getPluginManager().unloadPlugin((Object) ServerUtilsApp.getPlatformPlugin()).tryClose();