diff --git a/bungee/src/main/java/me/lucko/luckperms/LPBungeePlugin.java b/bungee/src/main/java/me/lucko/luckperms/LPBungeePlugin.java index 7fd2ad85..8d00a0c2 100644 --- a/bungee/src/main/java/me/lucko/luckperms/LPBungeePlugin.java +++ b/bungee/src/main/java/me/lucko/luckperms/LPBungeePlugin.java @@ -16,20 +16,14 @@ import net.md_5.bungee.api.plugin.Plugin; import java.util.UUID; import java.util.concurrent.TimeUnit; +@Getter public class LPBungeePlugin extends Plugin implements LuckPermsPlugin { public static final String VERSION = "v1.0"; - @Getter - LPConfiguration configuration; - - @Getter - UserManager userManager; - - @Getter - GroupManager groupManager; - - @Getter - Datastore datastore; + private LPConfiguration configuration; + private UserManager userManager; + private GroupManager groupManager; + private Datastore datastore; @Override public void onEnable() { @@ -58,17 +52,6 @@ public class LPBungeePlugin extends Plugin implements LuckPermsPlugin { } } - - @Override - public UserManager getUserManager() { - return userManager; - } - - @Override - public GroupManager getGroupManager() { - return groupManager; - } - @Override public String getVersion() { return VERSION; @@ -85,16 +68,6 @@ public class LPBungeePlugin extends Plugin implements LuckPermsPlugin { return getProxy().getOnlineCount(); } - @Override - public LPConfiguration getConfiguration() { - return configuration; - } - - @Override - public Datastore getDatastore() { - return datastore; - } - @Override public void runUpdateTask() { new UpdateTask(this).run(); diff --git a/common/src/main/java/me/lucko/luckperms/utils/PermissionObject.java b/common/src/main/java/me/lucko/luckperms/utils/PermissionObject.java index 4fb7b174..2da9d03b 100644 --- a/common/src/main/java/me/lucko/luckperms/utils/PermissionObject.java +++ b/common/src/main/java/me/lucko/luckperms/utils/PermissionObject.java @@ -2,7 +2,6 @@ package me.lucko.luckperms.utils; import lombok.Getter; import lombok.Setter; -import lombok.NonNull; import me.lucko.luckperms.LuckPermsPlugin; import me.lucko.luckperms.exceptions.ObjectAlreadyHasException; import me.lucko.luckperms.exceptions.ObjectLacksPermissionException; @@ -36,7 +35,6 @@ public abstract class PermissionObject { * If false, only permissions specific to the server are applied */ @Setter - private boolean includeGlobalPermissions; /** @@ -158,8 +156,10 @@ public abstract class PermissionObject { } node = parts[1]; - perms.put(node, getNodes().get(originalNode)); - continue; + if (!node.matches("luckperms\\.group\\..*")) { + perms.put(node, getNodes().get(originalNode)); + continue; + } } if (node.matches("luckperms\\.group\\..*")) {