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

Add Bukkit child permissions to the PermissionRegistry

Browse Source
This commit is contained in:
Luck 2021-05-06 12:23:09 +01:00
parent 528d668bc6
commit 1511193e58
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
3 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bukkit/src/main/java/me/lucko/luckperms/bukkit/inject/server/LuckPermsPermissionMap.java
View File

@ -241,6 +241,10 @@ public final class LuckPermsPermissionMap extends ForwardingMap<String, Permissi
NotifyingChildrenMap(Map<String, Boolean> delegate) { NotifyingChildrenMap(Map<String, Boolean> delegate) {
this.delegate = delegate; this.delegate = delegate;
for (String key : this.delegate.keySet()) {
LuckPermsPermissionMap.this.plugin.getPermissionRegistry().insert(key);
}
} }
@Override @Override
@ -251,6 +255,7 @@ public final class LuckPermsPermissionMap extends ForwardingMap<String, Permissi
@Override @Override
public Boolean put(@NonNull String key, @NonNull Boolean value) { public Boolean put(@NonNull String key, @NonNull Boolean value) {
Boolean ret = super.put(key, value); Boolean ret = super.put(key, value);
LuckPermsPermissionMap.this.plugin.getPermissionRegistry().insert(key);
LuckPermsPermissionMap.this.update(); LuckPermsPermissionMap.this.update();
return ret; return ret;
} }
@ -258,6 +263,9 @@ public final class LuckPermsPermissionMap extends ForwardingMap<String, Permissi
@Override @Override
public void putAll(@NonNull Map<? extends String, ? extends Boolean> map) { public void putAll(@NonNull Map<? extends String, ? extends Boolean> map) {
super.putAll(map); super.putAll(map);
for (String key : map.keySet()) {
LuckPermsPermissionMap.this.plugin.getPermissionRegistry().insert(key);
}
LuckPermsPermissionMap.this.update(); LuckPermsPermissionMap.this.update();
} }

2
common/src/main/java/me/lucko/luckperms/common/treeview/PermissionRegistry.java
View File

@ -93,6 +93,8 @@ public class PermissionRegistry implements AutoCloseable {
} }
private void doInsert(String permission) { private void doInsert(String permission) {
permission = permission.toLowerCase();
// split the permission up into parts // split the permission up into parts
Iterable<String> parts = DOT_SPLIT.split(permission); Iterable<String> parts = DOT_SPLIT.split(permission);

22
nukkit/src/main/java/me/lucko/luckperms/nukkit/inject/server/LuckPermsPermissionMap.java
View File

@ -206,11 +206,11 @@ public final class LuckPermsPermissionMap extends ForwardingMap<String, Permissi
try { try {
//noinspection unchecked //noinspection unchecked
Map<String, Boolean> children = (Map<String, Boolean>) PERMISSION_CHILDREN_FIELD.get(permission); Map<String, Boolean> children = (Map<String, Boolean>) PERMISSION_CHILDREN_FIELD.get(permission);
while (children instanceof PermissionNotifyingChildrenMap) { while (children instanceof NotifyingChildrenMap) {
children = ((PermissionNotifyingChildrenMap) children).delegate; children = ((NotifyingChildrenMap) children).delegate;
} }
PermissionNotifyingChildrenMap notifyingChildren = new PermissionNotifyingChildrenMap(children); NotifyingChildrenMap notifyingChildren = new NotifyingChildrenMap(children);
PERMISSION_CHILDREN_FIELD.set(permission, notifyingChildren); PERMISSION_CHILDREN_FIELD.set(permission, notifyingChildren);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
@ -226,8 +226,8 @@ public final class LuckPermsPermissionMap extends ForwardingMap<String, Permissi
try { try {
//noinspection unchecked //noinspection unchecked
Map<String, Boolean> children = (Map<String, Boolean>) PERMISSION_CHILDREN_FIELD.get(permission); Map<String, Boolean> children = (Map<String, Boolean>) PERMISSION_CHILDREN_FIELD.get(permission);
while (children instanceof PermissionNotifyingChildrenMap) { while (children instanceof NotifyingChildrenMap) {
children = ((PermissionNotifyingChildrenMap) children).delegate; children = ((NotifyingChildrenMap) children).delegate;
} }
PERMISSION_CHILDREN_FIELD.set(permission, children); PERMISSION_CHILDREN_FIELD.set(permission, children);
} catch (Exception e) { } catch (Exception e) {
@ -236,11 +236,15 @@ public final class LuckPermsPermissionMap extends ForwardingMap<String, Permissi
return permission; return permission;
} }
private final class PermissionNotifyingChildrenMap extends ForwardingMap<String, Boolean> { private final class NotifyingChildrenMap extends ForwardingMap<String, Boolean> {
private final Map<String, Boolean> delegate; private final Map<String, Boolean> delegate;
PermissionNotifyingChildrenMap(Map<String, Boolean> delegate) { NotifyingChildrenMap(Map<String, Boolean> delegate) {
this.delegate = delegate; this.delegate = delegate;
for (String key : this.delegate.keySet()) {
LuckPermsPermissionMap.this.plugin.getPermissionRegistry().insert(key);
}
} }
@Override @Override
@ -251,6 +255,7 @@ public final class LuckPermsPermissionMap extends ForwardingMap<String, Permissi
@Override @Override
public Boolean put(@NonNull String key, @NonNull Boolean value) { public Boolean put(@NonNull String key, @NonNull Boolean value) {
Boolean ret = super.put(key, value); Boolean ret = super.put(key, value);
LuckPermsPermissionMap.this.plugin.getPermissionRegistry().insert(key);
LuckPermsPermissionMap.this.update(); LuckPermsPermissionMap.this.update();
return ret; return ret;
} }
@ -258,6 +263,9 @@ public final class LuckPermsPermissionMap extends ForwardingMap<String, Permissi
@Override @Override
public void putAll(@NonNull Map<? extends String, ? extends Boolean> map) { public void putAll(@NonNull Map<? extends String, ? extends Boolean> map) {
super.putAll(map); super.putAll(map);
for (String key : map.keySet()) {
LuckPermsPermissionMap.this.plugin.getPermissionRegistry().insert(key);
}
LuckPermsPermissionMap.this.update(); LuckPermsPermissionMap.this.update();
} }