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

Close plugins internally when reloading them instead of externally

Browse source
This commit is contained in:
Frank van der Heijden 2020-07-19 21:55:00 +02:00
parent a0e0072f12
commit 4b6008299b
No known key found for this signature in database
GPG key ID: 26DA56488D314D11
6 changed files with 23 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Common/src/main/java/net/frankheijden/serverutils/common/managers/AbstractPluginManager.java
View file

@ -15,9 +15,9 @@ public abstract class AbstractPluginManager<T> extends PluginProvider<T> {
public abstract Result enablePlugin(T plugin);
public abstract CloseableResult reloadPlugin(String pluginName);
public abstract Result reloadPlugin(String pluginName);
public abstract CloseableResult reloadPlugin(T plugin);
public abstract Result reloadPlugin(T plugin);
public abstract CloseableResult unloadPlugin(String pluginName);

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

@ -16,7 +16,6 @@ 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.CloseableResult;
import net.frankheijden.serverutils.common.entities.ServerCommandSender;
import net.frankheijden.serverutils.common.entities.ServerUtilsPlugin;
import net.frankheijden.serverutils.common.managers.AbstractVersionManager;
@ -181,9 +180,8 @@ public class UpdateCheckerTask implements Runnable {
if (isStartupCheck()) {
plugin.getLogger().info(String.format(DOWNLOADED_RESTART, downloadedVersion));
CloseableResult result = plugin.getPluginManager().reloadPlugin((Object)ServerUtilsApp.getPlatformPlugin());
plugin.getPluginManager().reloadPlugin((Object)ServerUtilsApp.getPlatformPlugin());
plugin.getLogger().info(String.format(UPGRADE_SUCCESS, downloadedVersion));
result.tryClose();
} else {
broadcastDownloadStatus(downloadedVersion, false);
}