Skip to content

Clear bukkit permissions when disabling plugin #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
FrankHeijden wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Clear bukkit permissions when disabling plugin #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
818d7c3
Clear bukkit permissions when disabling plugin
FrankHeijden Aug 23, 2021
3da9015
Checkstyle
FrankHeijden Aug 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Bukkit/src/main/java/net/frankheijden/serverutils/bukkit/managers/BukkitPluginManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ public PluginResults<Plugin> disableOrderedPlugins(List<Plugin> plugins) {
}

unregisterCommands(plugin);
RSimplePluginManager.clearPermissions(Bukkit.getPluginManager(), plugin.getDescription().getPermissions());
Bukkit.getPluginManager().callEvent(new BukkitPluginDisableEvent(plugin, PluginEvent.Stage.POST));

disableResults.addResult(pluginId, plugin);
Expand Down
27 changes: 27 additions & 0 deletions ...it/src/main/java/net/frankheijden/serverutils/bukkit/reflection/RSimplePluginManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
package net.frankheijden.serverutils.bukkit.reflection;

import dev.frankheijden.minecraftreflection.MinecraftReflection;
import java.util.Collection;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
import java.util.regex.Pattern;
import org.bukkit.permissions.Permissible;
import org.bukkit.permissions.Permission;
import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.PluginLoader;
import org.bukkit.plugin.PluginManager;
import org.bukkit.plugin.SimplePluginManager;

public class RSimplePluginManager {
Expand All @@ -25,6 +30,28 @@ public static List<Plugin> getPlugins(Object manager) {
return reflection.get(manager, "plugins");
}

public static Map<Boolean, Set<Permission>> getDefaultPermissions(Object manager) {
return reflection.get(manager, "defaultPerms");
}

/**
* Clears permissions from the given plugin manager.
*/
public static void clearPermissions(PluginManager manager, Collection<? extends Permission> permissions) {
Map<Boolean, Set<Permission>> defaultPerms = reflection.get(manager, "defaultPerms");
Map<String, Map<Permissible, Boolean>> permSubs = reflection.get(manager, "permSubs");

for (Permission permission : permissions) {
manager.removePermission(permission);
for (Set<Permission> value : defaultPerms.values()) {
value.remove(permission);
}

String name = permission.getName().toLowerCase(Locale.ENGLISH);
permSubs.remove(name);
}
}

/**
* Removes the lookup name of the plugin.
* This ensures the plugin cannot be found anymore in Bukkit#getPlugin(String name).
Expand Down