Upstream/LuckPerms
1
0
Fork 0
mirror of https://github.com/LuckPerms/LuckPerms.git synced 2024-11-27 21:29:47 +01:00
Code Issues Projects Releases Wiki Activity

Fix (un)setting nodes through Vault with null worlds (#1826)

Browse Source
This commit is contained in:
Luck 2019-11-29 12:16:24 +00:00
parent 01e17adf82
commit 6fdd349654
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bukkit/src/main/java/me/lucko/luckperms/bukkit/vault/LuckPermsVaultPermission.java
View File

@ -51,7 +51,6 @@ import net.luckperms.api.context.MutableContextSet;
import net.luckperms.api.model.data.DataType; import net.luckperms.api.model.data.DataType;
import net.luckperms.api.query.Flag; import net.luckperms.api.query.Flag;
import net.luckperms.api.query.QueryOptions; import net.luckperms.api.query.QueryOptions;
import net.luckperms.api.util.Result;
import net.luckperms.api.util.Tristate; import net.luckperms.api.util.Tristate;
import net.milkbowl.vault.permission.Permission; import net.milkbowl.vault.permission.Permission;
@ -438,7 +437,11 @@ public class LuckPermsVaultPermission extends AbstractVaultPermission {
logMsg("#holderAddPermission: %s - %s - %s", holder.getPlainDisplayName(), permission, world); logMsg("#holderAddPermission: %s - %s - %s", holder.getPlainDisplayName(), permission, world);
} }
if (((Result) holder.setNode(DataType.NORMAL, NodeBuilders.determineMostApplicable(permission).value(true).withContext(DefaultContextKeys.SERVER_KEY, getVaultServer()).withContext(DefaultContextKeys.WORLD_KEY, world).build(), true)).wasSuccessful()) { if (world == null) {
world = "global";
}
if (holder.setNode(DataType.NORMAL, NodeBuilders.determineMostApplicable(permission).value(true).withContext(DefaultContextKeys.SERVER_KEY, getVaultServer()).withContext(DefaultContextKeys.WORLD_KEY, world).build(), true).wasSuccessful()) {
return holderSave(holder); return holderSave(holder);
} }
return false; return false;
@ -452,6 +455,10 @@ public class LuckPermsVaultPermission extends AbstractVaultPermission {
logMsg("#holderRemovePermission: %s - %s - %s", holder.getPlainDisplayName(), permission, world); logMsg("#holderRemovePermission: %s - %s - %s", holder.getPlainDisplayName(), permission, world);
} }
if (world == null) {
world = "global";
}
if (holder.unsetNode(DataType.NORMAL, NodeBuilders.determineMostApplicable(permission).withContext(DefaultContextKeys.SERVER_KEY, getVaultServer()).withContext(DefaultContextKeys.WORLD_KEY, world).build()).wasSuccessful()) { if (holder.unsetNode(DataType.NORMAL, NodeBuilders.determineMostApplicable(permission).withContext(DefaultContextKeys.SERVER_KEY, getVaultServer()).withContext(DefaultContextKeys.WORLD_KEY, world).build()).wasSuccessful()) {
return holderSave(holder); return holderSave(holder);
} }

3
nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/permissible/LPPermissionAttachment.java
View File

@ -35,7 +35,6 @@ import me.lucko.luckperms.nukkit.inject.dummy.DummyPlugin;
import net.luckperms.api.model.data.DataType; import net.luckperms.api.model.data.DataType;
import net.luckperms.api.node.Node; import net.luckperms.api.node.Node;
import net.luckperms.api.node.metadata.NodeMetadataKey; import net.luckperms.api.node.metadata.NodeMetadataKey;
import net.luckperms.api.util.Result;
import cn.nukkit.permission.Permission; import cn.nukkit.permission.Permission;
import cn.nukkit.permission.PermissionAttachment; import cn.nukkit.permission.PermissionAttachment;
@ -192,7 +191,7 @@ public class LPPermissionAttachment extends PermissionAttachment {
// set the transient node // set the transient node
User user = this.permissible.getUser(); User user = this.permissible.getUser();
((Result) user.setNode(DataType.TRANSIENT, node, true)).wasSuccessful(); user.setNode(DataType.TRANSIENT, node, true).wasSuccessful();
} }
private void unsetPermissionInternal(String name) { private void unsetPermissionInternal(String name) {

1
sponge/src/main/java/me/lucko/luckperms/sponge/model/SpongeGroup.java
View File

@ -40,7 +40,6 @@ public class SpongeGroup extends Group implements SpongePermissionHolder {
@Override @Override
protected void invalidateCache() { protected void invalidateCache() {
super.invalidateCache(); super.invalidateCache();
this.spongeData.fireUpdateEvent(); this.spongeData.fireUpdateEvent();
} }