Upstream/LuckPerms
1
0
Fork 0
mirror of https://github.com/LuckPerms/LuckPerms.git synced 2024-07-06 19:44:55 +02:00
Code Issues Projects Releases Wiki Activity

Fix Nukkit PermissionAttachments always throwing NPEs

Browse Source
This commit is contained in:
Luck 2021-05-10 17:38:56 +01:00
parent 7ebbfcf0d2
commit 228687b741
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
2 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/server/LuckPermsSubscriptionMap.java
View File

@ -154,7 +154,7 @@ public final class LuckPermsSubscriptionMap implements Map<String, Map<Permissib
@Override public Set<String> keySet() { throw new UnsupportedOperationException(); }
@Override public Collection<Map<Permissible, Boolean>> values() { throw new UnsupportedOperationException(); }
@Override public Set<Entry<String, Map<Permissible, Boolean>>> entrySet() { throw new UnsupportedOperationException(); }
@Override public int size() { throw new UnsupportedOperationException(); }
@Override public int size() { return 0; }
@Override public boolean isEmpty() { throw new UnsupportedOperationException(); }
@Override public boolean containsKey(Object key) { throw new UnsupportedOperationException(); }
@Override public boolean containsValue(Object value) { throw new UnsupportedOperationException(); }

36
nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/permissible/LuckPermsPermissible.java
View File

@ -42,6 +42,7 @@ import net.luckperms.api.query.QueryOptions;
import net.luckperms.api.util.Tristate;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.checkerframework.checker.nullness.qual.Nullable;
import cn.nukkit.Player;
import cn.nukkit.permission.PermissibleBase;
@ -223,32 +224,27 @@ public class LuckPermsPermissible extends PermissibleBase {
}
@Override
public LuckPermsPermissionAttachment addAttachment(Plugin plugin) {
public PermissionAttachment addAttachment(Plugin plugin) {
return addAttachment(plugin, null, null);
}
@Override
public PermissionAttachment addAttachment(Plugin plugin, @Nullable String permission) {
return addAttachment(plugin, permission, null);
}
@Override
public PermissionAttachment addAttachment(Plugin plugin, @Nullable String permission, @Nullable Boolean value) {
Objects.requireNonNull(plugin, "plugin");
LuckPermsPermissionAttachment attachment = new LuckPermsPermissionAttachment(this, plugin);
attachment.hook();
return attachment;
}
@Override
public PermissionAttachment addAttachment(Plugin plugin, String permission) {
Objects.requireNonNull(plugin, "plugin");
Objects.requireNonNull(permission, "permission");
if (permission != null) { // ffs nukkit, why
boolean val = value == null || value;
attachment.setPermission(permission, val);
}
PermissionAttachment attachment = addAttachment(plugin);
attachment.setPermission(permission, true);
return attachment;
}
@Override
public PermissionAttachment addAttachment(Plugin plugin, String permission, Boolean value) {
Objects.requireNonNull(plugin, "plugin");
Objects.requireNonNull(permission, "permission");
Objects.requireNonNull(value, "value");
PermissionAttachment attachment = addAttachment(plugin);
attachment.setPermission(permission, value);
return attachment;
}