Merge pull request #37 from FrankHeijden/fix/unload-after-startup

Disable plugins before unloading on startup 👀
This commit is contained in:
Frank van der Heijden 2021-10-14 16:01:09 +02:00 committed by GitHub
commit 2d9d717809
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -20,6 +20,7 @@ import net.frankheijden.serverutils.common.config.ConfigResource;
import net.frankheijden.serverutils.common.config.MessageKey;
import net.frankheijden.serverutils.common.config.MessagesResource;
import net.frankheijden.serverutils.common.entities.results.CloseablePluginResults;
import net.frankheijden.serverutils.common.entities.results.PluginResults;
import net.frankheijden.serverutils.common.managers.AbstractPluginManager;
import net.frankheijden.serverutils.common.managers.AbstractTaskManager;
import net.frankheijden.serverutils.common.managers.UpdateManager;
@ -119,6 +120,12 @@ public abstract class ServerUtilsPlugin<P, T, C extends ServerUtilsAudience<S>,
if (plugins.isEmpty()) return;
PluginResults<P> disableResults = getPluginManager().disablePlugins(plugins);
if (!disableResults.isSuccess()) {
disableResults.sendTo(getChatProvider().getConsoleServerAudience(), null);
return;
}
CloseablePluginResults<P> unloadResults = getPluginManager().unloadPlugins(plugins);
unloadResults.tryClose();
unloadResults.sendTo(getChatProvider().getConsoleServerAudience(), MessageKey.UNLOADPLUGIN);