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

Uniformization of how permission check is handled between pandalib-(.*-)players, Paper/Bungee and pandalib-permissions.

Browse Source 
When an *OnlinePlayer class ask for permission, it always ask for Paper/Bungee API. The pandalib-permissions system will be called by Paper/Bungee only if it used and integrated into Paper/Bungee using the appropriate modules.
This commit reduces inter-dependencies between pandalib-(.*-)permissions modules and pandalib-(.*-)players (except pandalib-players-permissible that has to depends on pandalib-permissions)
This commit is contained in:
Marc Baloup
2022-08-08 03:16:00 +02:00
parent a885c224a6
commit f976350ee1
14 changed files with 95 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pandalib-players-permissible/pom.xml
View File

@@ -23,7 +23,7 @@
<dependency>
<groupId>fr.pandacube.lib</groupId>
<artifactId>pandalib-players-standalone</artifactId>
<artifactId>pandalib-players</artifactId>
<version>${project.version}</version>
</dependency>

17
pandalib-players-permissible/src/main/java/fr/pandacube/lib/players/permissible/PermissibleOnlinePlayer.java
View File

@@ -3,6 +3,7 @@ package fr.pandacube.lib.players.permissible;
import java.util.OptionalLong;
import java.util.stream.LongStream;
import fr.pandacube.lib.permissions.PermissionExpressionParser;
import fr.pandacube.lib.players.standalone.StandaloneOnlinePlayer;
public interface PermissibleOnlinePlayer extends PermissibleOffPlayer, StandaloneOnlinePlayer {
@@ -45,7 +46,9 @@ public interface PermissibleOnlinePlayer extends PermissibleOffPlayer, Standalon
* indirectly call the method {@link PermissibleOffPlayer#hasPermissionExpression(String)},
* or it may result in a {@link StackOverflowError}.
*/
boolean hasPermissionExpression(String permission);
default boolean hasPermissionExpression(String permissionExpression) {
return PermissionExpressionParser.evaluate(permissionExpression, this::hasPermission);
}
/**
* Lists all the values for a set of permission indicating an integer in a range.
@@ -60,12 +63,20 @@ public interface PermissibleOnlinePlayer extends PermissibleOffPlayer, Standalon
* @param permissionPrefix the permission prefix to search for.
* @return a LongStream containing all the values found for the specified permission prefix.
*/
LongStream getPermissionRangeValues(String permissionPrefix);
default LongStream getPermissionRangeValues(String permissionPrefix) {
String server = getServerName();
String world = server == null ? null : getWorldName();
return getPermissionUser().getPermissionRangeValues(permissionPrefix, server, world);
}
/**
* Returns the maximum value returned by {@link PermissibleOffPlayer#getPermissionRangeValues(String)}.
*/
OptionalLong getPermissionRangeMax(String permissionPrefix);
default OptionalLong getPermissionRangeMax(String permissionPrefix) {
String server = getServerName();
String world = server == null ? null : getWorldName();
return getPermissionUser().getPermissionRangeMax(permissionPrefix, server, world);
}