From 3771a50f30f310e0165a5ed1947b574fc06a2cda Mon Sep 17 00:00:00 2001 From: Luck Date: Tue, 6 Dec 2016 19:21:48 +0000 Subject: [PATCH] cleanup --- .../luckperms/common/core/model/PermissionHolder.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/common/src/main/java/me/lucko/luckperms/common/core/model/PermissionHolder.java b/common/src/main/java/me/lucko/luckperms/common/core/model/PermissionHolder.java index 8024996c9..4b1e5f9ee 100644 --- a/common/src/main/java/me/lucko/luckperms/common/core/model/PermissionHolder.java +++ b/common/src/main/java/me/lucko/luckperms/common/core/model/PermissionHolder.java @@ -339,8 +339,8 @@ public abstract class PermissionHolder { parents.removeIf(node -> !node.shouldApplyOnServer(server, context.isApplyGlobalGroups(), plugin.getConfiguration().isApplyingRegex()) || - !node.shouldApplyOnWorld(world, context.isApplyGlobalWorldGroups(), plugin.getConfiguration().isApplyingRegex()) || - !node.shouldApplyWithContext(contexts.getContextSet(), false) + !node.shouldApplyOnWorld(world, context.isApplyGlobalWorldGroups(), plugin.getConfiguration().isApplyingRegex()) || + !node.shouldApplyWithContext(contexts.getContextSet(), false) ); TreeSet> sortedParents = new TreeSet<>(Util.META_COMPARATOR.reversed()); @@ -467,8 +467,8 @@ public abstract class PermissionHolder { allNodes.removeIf(node -> !node.shouldApplyOnServer(server, context.isIncludeGlobal(), plugin.getConfiguration().isApplyingRegex()) || - !node.shouldApplyOnWorld(world, context.isIncludeGlobalWorld(), plugin.getConfiguration().isApplyingRegex()) || - !node.shouldApplyWithContext(contexts.getContextSet(), false) + !node.shouldApplyOnWorld(world, context.isIncludeGlobalWorld(), plugin.getConfiguration().isApplyingRegex()) || + !node.shouldApplyWithContext(contexts.getContextSet(), false) ); Set perms = ConcurrentHashMap.newKeySet();