Remove timeout filtering and add server group permissions to the set

Author: GiantTreeLP

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

@@ -94,10 +94,7 @@ public void recalculatePermissions() {
             permissions.put(key, permissionAttachmentInfo);
         });
         permissionEntity.getGroups()
-                        .stream()
-                        .filter(g -> g.getTimeout() > System.currentTimeMillis())
-                        .map(g -> CloudAPI.getInstance()
-                                          .getPermissionGroup(g.getGroup()))
+                        .stream().map(g -> CloudAPI.getInstance().getPermissionGroup(g.getGroup()))
                         .filter(Objects::nonNull)
                         .flatMap(g -> {
                             Stream.Builder<PermissionGroup> builder = Stream.<PermissionGroup>builder().add(g);
@@ -114,6 +111,10 @@ public void recalculatePermissions() {
                                 PermissionAttachmentInfo permissionAttachmentInfo = new PermissionAttachmentInfo(this, key, null, value);
                                 permissions.put(key, permissionAttachmentInfo);
                             });
+                            g.getServerGroupPermissions().get(CloudAPI.getInstance().getGroup()).forEach(key -> {
+                                PermissionAttachmentInfo permissionAttachmentInfo = new PermissionAttachmentInfo(this, key, null, true);
+                                permissions.put(key, permissionAttachmentInfo);
+                            });
                         });
     }