Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2024-12-27 11:38:03 +01:00
Code Issues Projects Releases Wiki Activity

Permission improvement

Browse Source
This commit is contained in:
Felix Cravic 2020-12-11 21:42:32 +01:00
parent 76c3ea52ac
commit 90102e1562
3 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/net/minestom/server/permission/Permission.java
View File

@ -9,6 +9,10 @@ import java.util.Objects;
/**
* Representation of a permission granted to a {@link CommandSender}.
* Each permission has a string representation used as an identifier, and an optional
* {@link NBTCompound} used to store additional data.
* <p>
* The class is immutable.
*/
public class Permission {

13
src/main/java/net/minestom/server/permission/PermissionHandler.java
View File

@ -37,6 +37,15 @@ public interface PermissionHandler {
getAllPermissions().remove(permission);
}
/**
* Removes a {@link Permission} based on its string identifier.
*
* @param permissionName the permission name
*/
default void removePermission(@NotNull String permissionName) {
getAllPermissions().removeIf(permission -> permission.getPermissionName().equals(permissionName));
}
/**
* Gets if this handler has the permission {@code permission}.
* <p>
@ -87,9 +96,7 @@ public interface PermissionHandler {
if (permission != null) {
// Verify using the permission verifier
return permissionVerifier != null ?
permissionVerifier.isValid(permission.getNBTData()) :
true;
return permissionVerifier == null || permissionVerifier.isValid(permission.getNBTData());
}
return false;
}

7
src/test/java/permissions/TestPermissions.java
View File

@ -65,7 +65,12 @@ public class TestPermissions {
player.addPermission(permission1);
assertTrue(player.hasPermission("perm.name"));
assertTrue(player.hasPermission("perm.name",
nbtCompound -> nbtCompound != null && nbtCompound.getString("name").equals("Minestom")));
nbtCompound -> {
if (nbtCompound != null && nbtCompound.containsKey("name")) {
return nbtCompound.getString("name").equals("Minestom");
}
return false;
}));
player.addPermission(permission2);
assertFalse(player.hasPermission("perm.name2", nbtCompound -> nbtCompound != null));