Skip to content

Commit d31e9c2

Browse files
committed
Default permission resolution strategy improved.
Signed-off-by: Pavel Erokhin (MairwunNx) <MairwunNx@gmail.com>
1 parent ee4aa50 commit d31e9c2

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

src/main/kotlin/com/mairwunnx/projectessentials/core/api/v1/permissions/strategy/DefaultPermissionResolutionStrategy.kt

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.mairwunnx.projectessentials.core.api.v1.permissions.strategy
22

33
import net.minecraft.entity.player.ServerPlayerEntity
4+
import net.minecraftforge.server.permission.DefaultPermissionHandler
45
import net.minecraftforge.server.permission.PermissionAPI
56

67
/**
@@ -15,8 +16,12 @@ import net.minecraftforge.server.permission.PermissionAPI
1516
class DefaultPermissionResolutionStrategy : IPermissionResolutionStrategy {
1617
override fun hasPermission(
1718
player: ServerPlayerEntity, node: String, opLevel: Int
18-
) = when {
19-
PermissionAPI.hasPermission(player, node) -> true
20-
else -> player.hasPermissionLevel(opLevel)
19+
) = if (PermissionAPI.getPermissionHandler() is DefaultPermissionHandler) {
20+
when {
21+
PermissionAPI.hasPermission(player, node) -> true
22+
else -> player.hasPermissionLevel(opLevel)
23+
}
24+
} else {
25+
PermissionAPI.hasPermission(player, node)
2126
}
2227
}

0 commit comments

Comments
 (0)