From 10d4ba866dad8d22ffe6c965ee3089154c171c32 Mon Sep 17 00:00:00 2001 From: Frank van der Heijden Date: Tue, 21 Dec 2021 23:29:20 +0100 Subject: [PATCH] Improve /su restart file lookup --- .../serverutils/common/tasks/UpdateCheckerTask.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 e8c17e6..b69cf14 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 @@ -19,6 +19,7 @@ import net.frankheijden.serverutils.common.entities.ServerUtilsAudience; import net.frankheijden.serverutils.common.entities.ServerUtilsPlugin; import net.frankheijden.serverutils.common.entities.http.GitHubAsset; import net.frankheijden.serverutils.common.entities.http.GitHubResponse; +import net.frankheijden.serverutils.common.managers.AbstractPluginManager; import net.frankheijden.serverutils.common.managers.UpdateManager; import net.frankheijden.serverutils.common.utils.GitHubUtils; import net.frankheijden.serverutils.common.utils.VersionUtils; @@ -95,7 +96,10 @@ public class UpdateCheckerTask, P> im public static

void restart(ServerUtilsAudience sender) { ServerUtilsApp.getPlugin().getTaskManager().runTaskAsynchronously(() -> { UpdateCheckerTask task = new UpdateCheckerTask<>(ServerUtilsApp.getPlugin(), sender, true, true); - task.downloadUpdaterAndReload(task.plugin.getPluginManager().getPluginFile(task.plugin.getPlugin())); + AbstractPluginManager pluginManager = task.plugin.getPluginManager(); + File pluginFile = pluginManager.getPluginFile(pluginManager.getPluginId(task.plugin.getPlugin())) + .orElse(pluginManager.getPluginFile(task.plugin.getPlugin())); + task.downloadUpdaterAndReload(pluginFile); }); }