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

Improve Bukkit (un)loading once more

Browse source 
- Call CraftServer#synCommands after (un)loading plugin
- Force command registrations of ServerUtils
This commit is contained in:
Frank van der Heijden 2020-10-01 19:32:53 +02:00
parent 1723a9564f
commit 7d6d360908
No known key found for this signature in database
GPG key ID: 26DA56488D314D11
3 changed files with 26 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Bukkit/src/main/java/net/frankheijden/serverutils/bukkit/managers/BukkitPluginManager.java
View file

@ -26,7 +26,7 @@ import net.frankheijden.serverutils.common.entities.Result;
import net.frankheijden.serverutils.common.managers.AbstractPluginManager;
import org.bukkit.Bukkit;
import org.bukkit.command.Command;
import org.bukkit.command.PluginCommand;
import org.bukkit.command.PluginIdentifiableCommand;
import org.bukkit.plugin.InvalidDescriptionException;
import org.bukkit.plugin.InvalidPluginException;
import org.bukkit.plugin.Plugin;
@ -188,11 +188,15 @@ public class BukkitPluginManager extends AbstractPluginManager<Plugin> {
public Result enablePlugin(Plugin plugin) {
if (plugin == null) return Result.NOT_EXISTS;
if (Bukkit.getPluginManager().isPluginEnabled(plugin.getName())) return Result.ALREADY_ENABLED;
Bukkit.getPluginManager().enablePlugin(plugin);
if (Bukkit.getPluginManager().isPluginEnabled(plugin.getName())) {
return Result.SUCCESS;
try {
RCraftServer.syncCommands();
} catch (ReflectiveOperationException ex) {
ex.printStackTrace();
}
return Result.ERROR;
return Bukkit.getPluginManager().isPluginEnabled(plugin.getName()) ? Result.SUCCESS : Result.ERROR;
}
/**
@ -253,16 +257,22 @@ public class BukkitPluginManager extends AbstractPluginManager<Plugin> {
if (knownCommands == null) return;
knownCommands.values().removeIf(c -> {
if (c instanceof PluginCommand) {
PluginCommand pc = (PluginCommand) c;
if (pc.getPlugin() == plugin) {
pc.unregister(RCraftServer.getCommandMap());
if (c instanceof PluginIdentifiableCommand) {
PluginIdentifiableCommand pc = (PluginIdentifiableCommand) c;
if (pc.getPlugin().getName().equals(plugin.getName())) {
c.unregister(RCraftServer.getCommandMap());
return true;
}
return false;
}
return false;
});
try {
RCraftServer.syncCommands();
} catch (ReflectiveOperationException ex) {
ex.printStackTrace();
}
}
/**