PandacubeFr/PandaLib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

Fix warnings and stuff

Browse Source
This commit is contained in:
Marc Baloup
2022-07-22 18:37:15 +02:00
parent c827027e77
commit c7a470e391
18 changed files with 46 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pandalib-paper-permissions/src/main/java/fr/pandacube/lib/paper/permissions/PandalibPaperPermissions.java
View File

@@ -7,7 +7,6 @@ import java.util.Objects;
import java.util.concurrent.ExecutionException;
import java.util.function.Function;
import java.util.function.Predicate;
import java.util.stream.Collectors;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender;
@@ -77,11 +76,11 @@ public class PandalibPaperPermissions implements Listener {
/* package */ static Function<String, List<Permission>> SUPERPERMS_PARENT_PERMISSION_GETTER = childPerm -> {
return Bukkit.getPluginManager().getPermissions().stream()
.filter(p -> p.getChildren().containsKey(childPerm))
.collect(Collectors.toList());
};
/* package */ static final Function<String, List<Permission>> SUPERPERMS_PARENT_PERMISSION_GETTER = childPerm -> Bukkit.getPluginManager()
.getPermissions()
.stream()
.filter(p -> p.getChildren().containsKey(childPerm))
.toList();
/* package */ static ServerOperator dummyOperator(boolean isOp) {
return new ServerOperator() {

10
pandalib-paper-permissions/src/main/java/fr/pandacube/lib/paper/permissions/PermissionsInjectorBukkit.java
View File

@@ -113,10 +113,14 @@ public class PermissionsInjectorBukkit
private final CommandSender sender;
private final Permissible oldPermissible;
/* package */ LoadingCache<String, List<Permission>> superPermsPermissionCache = CacheBuilder.newBuilder()
/* package */ final LoadingCache<String, List<Permission>> superPermsPermissionCache = CacheBuilder.newBuilder()
.build(CacheLoader.from(PandalibPaperPermissions.SUPERPERMS_PARENT_PERMISSION_GETTER::apply));
@SuppressWarnings("UnusedAssignment")
private boolean init = false;
/* assigment to false is necessary because of super class constructor calling the method recalculatePermission()
* and we don’t want that.
*/
private PandaPermissible(CommandSender sender, Permissible oldPermissible)
{
@@ -175,7 +179,7 @@ public class PermissionsInjectorBukkit
res = PandalibPaperPermissions.hasSuperPermsPermission(sender, permission.getName(), this::hasPermission, this); // supports negative permission
if (res != null)
return res;
return oldPermissible.hasPermission(permission); // doesn’t need to manage negative permission (should not happend)
}