mirror of
https://github.com/LuckPerms/LuckPerms.git
synced 2026-11-14 01:24:05 +00:00
Fix Fabric perm API v1 default handling (#4269)
This commit is contained in:
1 file changed
+9
-2
+9
-2
@@ -38,6 +38,7 @@ import net.fabricmc.fabric.api.permission.v1.PermissionContext;
|
||||
import net.fabricmc.fabric.api.permission.v1.PermissionEvents;
|
||||
import net.fabricmc.fabric.api.permission.v1.PermissionNode;
|
||||
import net.fabricmc.fabric.impl.permission.PermissionContextKey;
|
||||
import net.luckperms.api.util.Tristate;
|
||||
import net.minecraft.resources.Identifier;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
import net.minecraft.world.entity.Entity;
|
||||
@@ -108,12 +109,14 @@ public class FabricPermissionsApiV1Listener {
|
||||
private static Boolean permissionCheck(PermissionContext ctx, String permission) {
|
||||
Entity entity = ctx.get(PermissionContextKey.ENTITY);
|
||||
if (entity instanceof MixinUser user) {
|
||||
return user.luckperms$hasPermission(permission).asBoolean();
|
||||
Tristate result = user.luckperms$hasPermission(permission);
|
||||
return tristateToNullableBoolean(result);
|
||||
}
|
||||
|
||||
User user = ctx.get(USER_KEY);
|
||||
if (user != null) {
|
||||
return user.getCachedData().getPermissionData().checkPermission(permission, CheckOrigin.PLATFORM_API_HAS_PERMISSION).result().asBoolean();
|
||||
Tristate result = user.getCachedData().getPermissionData().checkPermission(permission, CheckOrigin.PLATFORM_API_HAS_PERMISSION).result();
|
||||
return tristateToNullableBoolean(result);
|
||||
}
|
||||
|
||||
return null;
|
||||
@@ -133,4 +136,8 @@ public class FabricPermissionsApiV1Listener {
|
||||
return null;
|
||||
}
|
||||
|
||||
private static Boolean tristateToNullableBoolean(Tristate value) {
|
||||
return value == Tristate.UNDEFINED ? null : value.asBoolean();
|
||||
}
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user