Fix kyori, add permissionlist command, fix luckperms getting wrong context
This commit is contained in:
@@ -7,7 +7,7 @@ plugins {
|
||||
group = "us.ajg0702.queue"
|
||||
|
||||
repositories {
|
||||
mavenLocal()
|
||||
//mavenLocal()
|
||||
mavenCentral()
|
||||
maven { url = uri("https://repo.ajg0702.us") }
|
||||
maven { url = uri("https://oss.sonatype.org/content/repositories/snapshots") }
|
||||
|
||||
@@ -3,17 +3,32 @@ package us.ajg0702.queue.logic;
|
||||
import us.ajg0702.queue.api.AliasManager;
|
||||
import us.ajg0702.queue.api.Logic;
|
||||
import us.ajg0702.queue.api.LogicGetter;
|
||||
import us.ajg0702.queue.api.players.AdaptedPlayer;
|
||||
import us.ajg0702.queue.common.QueueMain;
|
||||
import us.ajg0702.queue.logic.permissions.PermissionGetter;
|
||||
import us.ajg0702.utils.common.Config;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class LogicGetterImpl implements LogicGetter {
|
||||
PremiumLogic logic;
|
||||
|
||||
@Override
|
||||
public Logic constructLogic() {
|
||||
return new PremiumLogic(QueueMain.getInstance());
|
||||
if(logic == null) {
|
||||
logic = new PremiumLogic(QueueMain.getInstance());
|
||||
}
|
||||
return logic;
|
||||
}
|
||||
|
||||
@Override
|
||||
public AliasManager constructAliasManager(Config config) {
|
||||
return new PremiumAliasManager(config);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<String> getPermissions(AdaptedPlayer player) {
|
||||
if(logic == null) return null;
|
||||
return logic.getPermissionGetter().getSelected().getPermissions(player);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -12,6 +12,10 @@ import us.ajg0702.queue.logic.permissions.PermissionGetter;
|
||||
|
||||
public class PremiumLogic implements Logic {
|
||||
|
||||
public PermissionGetter getPermissionGetter() {
|
||||
return permissionGetter;
|
||||
}
|
||||
|
||||
private final PermissionGetter permissionGetter;
|
||||
public PremiumLogic(QueueMain main) {
|
||||
permissionGetter = new PermissionGetter(main);
|
||||
|
||||
@@ -36,7 +36,7 @@ public class LuckPermsHook implements PermissionHook {
|
||||
User user = api.getUserManager().getUser(player.getUniqueId());
|
||||
|
||||
assert user != null;
|
||||
SortedSet<Node> nodes = user.resolveDistinctInheritedNodes(QueryOptions.defaultContextualOptions());
|
||||
SortedSet<Node> nodes = user.resolveDistinctInheritedNodes(QueryOptions.nonContextual());
|
||||
|
||||
List<String> perms = new ArrayList<>();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user