Skip to content

Add support for LuckPerms group names #6229

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
wants to merge 1 commit into
base: 2.x
Choose a base branch
from
Open

Add support for LuckPerms group names #6229

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 21 additions & 2 deletions Essentials/src/main/java/com/earth2me/essentials/perm/impl/LuckPermsHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,19 @@

import com.earth2me.essentials.Essentials;
import com.earth2me.essentials.User;

import net.luckperms.api.LuckPerms;
import net.luckperms.api.context.ContextCalculator;
import net.luckperms.api.context.ContextConsumer;
import net.luckperms.api.context.ContextSet;
import net.luckperms.api.context.ImmutableContextSet;
import net.luckperms.api.model.group.Group;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.plugin.RegisteredServiceProvider;

import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.function.Function;
import java.util.function.Supplier;
Expand All @@ -39,6 +41,23 @@ public void unregisterContexts() {
}
}

@Override
public List<String> getGroups() {
final List<String> groups = new ArrayList<>();
for (final Group group : luckPerms.getGroupManager().getLoadedGroups()) {
groups.add(group.getName());
}

// Also add the vault group names for backwards compatibility
for (final String group : super.getGroups()) {
if (!groups.contains(group)) {
groups.add(group);
}
}

return groups;
}

@Override
public boolean tryProvider(Essentials ess) {
final RegisteredServiceProvider<LuckPerms> provider = Bukkit.getServicesManager().getRegistration(LuckPerms.class);
Expand All @@ -62,7 +81,7 @@ private Calculator(String id, Function<User, Iterable<String>> function, Supplie
}

// By combining all calculators into one, we only need to make one call to ess.getUser().
private class CombinedCalculator implements ContextCalculator<Player> {
private final class CombinedCalculator implements ContextCalculator<Player> {
private final Set<Calculator> calculators = new HashSet<>();

@Override
Expand Down
Loading