From 17b06c39e9fe79fd6ea0df9a08faefc44b8c7564 Mon Sep 17 00:00:00 2001 From: Luck Date: Sun, 30 Oct 2016 15:29:55 +0000 Subject: [PATCH] Ignore negated primary group override nodes & fix broken message --- .../lucko/luckperms/bukkit/vault/VaultPermissionHook.java | 8 ++++++++ .../java/me/lucko/luckperms/common/constants/Message.java | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/VaultPermissionHook.java b/bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/VaultPermissionHook.java index 7b8dcec1..eb3a0a35 100644 --- a/bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/VaultPermissionHook.java +++ b/bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/VaultPermissionHook.java @@ -327,6 +327,10 @@ public class VaultPermissionHook extends Permission { if (pgoCheckInherited) { PermissionData data = user.getUserData().getPermissionData(createContext(server, world)); for (Map.Entry e : data.getImmutableBacking().entrySet()) { + if (!e.getValue()) { + continue; + } + if (!e.getKey().toLowerCase().startsWith("vault.primarygroup.")) { continue; } @@ -348,6 +352,10 @@ public class VaultPermissionHook extends Permission { } } else { for (LocalizedNode node : user.getPermissions(true)) { + if (!node.getValue()) { + continue; + } + if (!node.getPermission().toLowerCase().startsWith("vault.primarygroup.")) { continue; } diff --git a/common/src/main/java/me/lucko/luckperms/common/constants/Message.java b/common/src/main/java/me/lucko/luckperms/common/constants/Message.java index 80c60721..1b2a20e1 100644 --- a/common/src/main/java/me/lucko/luckperms/common/constants/Message.java +++ b/common/src/main/java/me/lucko/luckperms/common/constants/Message.java @@ -172,7 +172,7 @@ public enum Message { UNSET_TEMP_PERMISSION_SERVER_WORLD_SUCCESS("&aUnset temporary permission &b{0}&a for &b{1}&a on server &b{2}&a, world &b{3}&a.", true), SET_INHERIT_SUCCESS("&b{0}&a now inherits permissions from &b{1}&a.", true), - SET_INHERIT_SERVER_SUCCESS("&b{0}&a now inherits permissions from &b{2}&a on server &b{3}&a.", true), + SET_INHERIT_SERVER_SUCCESS("&b{0}&a now inherits permissions from &b{1}&a on server &b{2}&a.", true), SET_INHERIT_SERVER_WORLD_SUCCESS("&b{0}&a now inherits permissions from &b{1}&a on server &b{2}&a, world &b{3}&a.", true), SET_TEMP_INHERIT_SUCCESS("&b{0}&a now inherits permissions from &b{1}&a for a duration of &b{2}&a.", true), SET_TEMP_INHERIT_SERVER_SUCCESS("&b{0}&a now inherits permissions from &b{1}&a on server &b{2}&a for a duration of &b{3}&a.", true),