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

Return correct result if plugin is already loaded/enabled

Browse source
This commit is contained in:
Frank van der Heijden 2021-07-21 03:07:23 +02:00
parent a82b90ce7d
commit f10407b5ea
No known key found for this signature in database
GPG key ID: B808721C2DD5B5B8
1 changed files with 3 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Velocity/src/main/java/net/frankheijden/serverutils/velocity/managers/VelocityPluginManager.java
View file

@ -64,6 +64,7 @@ public class VelocityPluginManager extends AbstractPluginManager<PluginContainer
Object javaPluginLoader = RJavaPluginLoader.newInstance(proxy, file.toPath().getParent()); Object javaPluginLoader = RJavaPluginLoader.newInstance(proxy, file.toPath().getParent());
PluginDescription candidate = RJavaPluginLoader.loadPluginDescription(javaPluginLoader, file.toPath()); PluginDescription candidate = RJavaPluginLoader.loadPluginDescription(javaPluginLoader, file.toPath());
if (proxy.getPluginManager().isLoaded(candidate.getId())) return new VelocityLoadResult(Result.ALREADY_LOADED);
for (PluginDependency dependency : candidate.getDependencies()) { for (PluginDependency dependency : candidate.getDependencies()) {
if (!dependency.isOptional() && !proxy.getPluginManager().isLoaded(dependency.getId())) { if (!dependency.isOptional() && !proxy.getPluginManager().isLoaded(dependency.getId())) {
@ -84,6 +85,8 @@ public class VelocityPluginManager extends AbstractPluginManager<PluginContainer
@Override @Override
public Result enablePlugin(PluginContainer container) { public Result enablePlugin(PluginContainer container) {
if (proxy.getPluginManager().isLoaded(container.getDescription().getId())) return Result.ALREADY_ENABLED;
Object javaPluginLoader = RJavaPluginLoader.newInstance( Object javaPluginLoader = RJavaPluginLoader.newInstance(
proxy, proxy,
container.getDescription().getSource().map(Path::getParent).orElse(null) container.getDescription().getSource().map(Path::getParent).orElse(null)