Skip to content
This repository was archived by the owner on Jun 7, 2022. It is now read-only.

Commit 0298b42

Browse files
committed
Fix non-existing server group list (ie. null)
1 parent 4625a9a commit 0298b42

File tree

1 file changed

+23
-23
lines changed
  • cloudnet-api/cloudnet-api-bridge/src/main/java/de/dytanic/cloudnet/bridge/internal/util

1 file changed

+23
-23
lines changed

cloudnet-api/cloudnet-api-bridge/src/main/java/de/dytanic/cloudnet/bridge/internal/util/CloudPermissible.java

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ public boolean hasPermission(String inName) {
6060

6161
if (cloudPlayer != null) {
6262
boolean hasPermission = cloudPlayer.getPermissionEntity().hasPermission(CloudAPI.getInstance().getPermissionPool(),
63-
inName,
64-
CloudAPI.getInstance().getGroup());
63+
inName,
64+
CloudAPI.getInstance().getGroup());
6565
CloudAPI.getInstance().getLogger().finest(cloudPlayer.getName() + " hasPermission \"" + inName + "\": " + hasPermission);
6666
return hasPermission;
6767

@@ -94,27 +94,27 @@ public void recalculatePermissions() {
9494
permissions.put(key, permissionAttachmentInfo);
9595
});
9696
permissionEntity.getGroups().stream().map(g -> CloudAPI.getInstance().getPermissionGroup(g.getGroup()))
97-
.filter(Objects::nonNull)
98-
.flatMap(g -> {
99-
Stream.Builder<PermissionGroup> builder = Stream.<PermissionGroup>builder().add(g);
100-
g.getImplementGroups()
101-
.stream()
102-
.map(i -> CloudAPI.getInstance().getPermissionGroup(i))
103-
.filter(Objects::nonNull)
104-
.forEach(builder);
105-
106-
return builder.build();
107-
})
108-
.forEach(g -> {
109-
g.getPermissions().forEach((key, value) -> {
110-
PermissionAttachmentInfo permissionAttachmentInfo = new PermissionAttachmentInfo(this, key, null, value);
111-
permissions.put(key, permissionAttachmentInfo);
112-
});
113-
g.getServerGroupPermissions().get(CloudAPI.getInstance().getGroup()).forEach(key -> {
114-
PermissionAttachmentInfo permissionAttachmentInfo = new PermissionAttachmentInfo(this, key, null, true);
115-
permissions.put(key, permissionAttachmentInfo);
116-
});
117-
});
97+
.filter(Objects::nonNull)
98+
.flatMap(g -> {
99+
Stream.Builder<PermissionGroup> builder = Stream.<PermissionGroup>builder().add(g);
100+
g.getImplementGroups()
101+
.stream()
102+
.map(i -> CloudAPI.getInstance().getPermissionGroup(i))
103+
.filter(Objects::nonNull)
104+
.forEach(builder);
105+
106+
return builder.build();
107+
})
108+
.forEach(g -> {
109+
g.getPermissions().forEach((key, value) -> {
110+
PermissionAttachmentInfo permissionAttachmentInfo = new PermissionAttachmentInfo(this, key, null, value);
111+
permissions.put(key, permissionAttachmentInfo);
112+
});
113+
g.getServerGroupPermissions().getOrDefault(CloudAPI.getInstance().getGroup(), Collections.emptyList()).forEach(key -> {
114+
PermissionAttachmentInfo permissionAttachmentInfo = new PermissionAttachmentInfo(this, key, null, true);
115+
permissions.put(key, permissionAttachmentInfo);
116+
});
117+
});
118118
}
119119

120120
@Override

0 commit comments

Comments
 (0)