Skip to content

fix: minestom permission checking #1658

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
0utplay merged 1 commit into from
Jun 18, 2025
Merged

fix: minestom permission checking #1658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions ...va/eu/cloudnetservice/modules/bridge/impl/platform/minestom/MinestomBridgeManagement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import eu.cloudnetservice.wrapper.event.ServiceInfoPropertiesConfigureEvent;
import eu.cloudnetservice.wrapper.holder.ServiceInfoHolder;
import jakarta.inject.Inject;
import jakarta.inject.Provider;
import jakarta.inject.Singleton;
import java.util.Collections;
import java.util.Optional;
Expand All @@ -61,7 +62,7 @@ public final class MinestomBridgeManagement extends PlatformBridgeManagement<Pla
private final CommandManager commandManager;
private final ConnectionManager connectionManager;
private final PlayerExecutor directGlobalExecutor;
private final MinestomPermissionChecker permissionChecker;
private final Provider<MinestomPermissionChecker> permissionChecker;

@Inject
public MinestomBridgeManagement(
Expand All @@ -76,7 +77,7 @@ public MinestomBridgeManagement(
@NonNull ServiceInfoHolder serviceInfoHolder,
@NonNull CloudServiceProvider serviceProvider,
@NonNull WrapperConfiguration wrapperConfiguration,
@NonNull @Service MinestomPermissionChecker permissionChecker
@NonNull @Service Provider<MinestomPermissionChecker> permissionChecker
) {
super(
rpcFactory,
Expand All @@ -93,7 +94,7 @@ public MinestomBridgeManagement(
this.permissionChecker = permissionChecker;

this.directGlobalExecutor = new MinestomDirectPlayerExecutor(
this.permissionChecker,
this.permissionFunction(),
commandManager,
PlayerExecutor.GLOBAL_UNIQUE_ID,
connectionManager::getOnlinePlayers);
Expand Down Expand Up @@ -129,7 +130,7 @@ public void registerServices(@NonNull ServiceRegistry registry) {

@Override
public @NonNull BiFunction<Player, String, Boolean> permissionFunction() {
return this.permissionChecker::hasPermission;
return (player, permission) -> this.permissionChecker.get().hasPermission(player, permission);
}

@Override
Expand Down Expand Up @@ -165,7 +166,7 @@ public void removeFallbackProfile(@NonNull Player player) {
return uniqueId.equals(PlayerExecutor.GLOBAL_UNIQUE_ID)
? this.directGlobalExecutor
: new MinestomDirectPlayerExecutor(
this.permissionChecker,
this.permissionFunction(),
this.commandManager,
uniqueId,
() -> Collections.singleton(this.connectionManager.getOnlinePlayerByUuid(uniqueId)));
Expand Down
7 changes: 4 additions & 3 deletions ...u/cloudnetservice/modules/bridge/impl/platform/minestom/MinestomDirectPlayerExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import eu.cloudnetservice.modules.bridge.player.executor.ServerSelectorType;
import java.util.Collection;
import java.util.UUID;
import java.util.function.BiFunction;
import java.util.function.Supplier;
import lombok.NonNull;
import net.kyori.adventure.text.Component;
Expand All @@ -31,10 +32,10 @@
final class MinestomDirectPlayerExecutor extends PlatformPlayerExecutorAdapter<Player> {

private final CommandManager commandManager;
private final MinestomPermissionChecker permissionChecker;
private final BiFunction<Player, String, Boolean> permissionChecker;

public MinestomDirectPlayerExecutor(
@NonNull MinestomPermissionChecker permissionChecker,
@NonNull BiFunction<Player, String, Boolean> permissionChecker,
@NonNull CommandManager commandManager,
@NonNull UUID uniqueId,
@NonNull Supplier<? extends Collection<? extends Player>> supplier
Expand Down Expand Up @@ -82,7 +83,7 @@ public void sendTitle(@NonNull Title title) {
@Override
public void sendChatMessage(@NonNull Component message, @Nullable String permission) {
this.forEach(player -> {
if (permission == null || this.permissionChecker.hasPermission(player, permission)) {
if (permission == null || this.permissionChecker.apply(player, permission)) {
player.sendMessage(message);
}
});
Expand Down
Loading