Skip to content
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

Adjusting the permissions node for the /rtp command #626

Merged
merged 7 commits into from
May 11, 2024
Merged

Adjusting the permissions node for the /rtp command #626

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7a94b57
Update RtpCommand.java
alazeprt May 7, 2024
f205a3b
Fix bug about suggestion filtering
alazeprt May 7, 2024
7bfabe0
Fix bug about suggestion filtering
alazeprt May 7, 2024
06a8d46
Fix bug about suggestion filtering
alazeprt May 7, 2024
46371d4
Fix bug about suggestion filtering
alazeprt May 7, 2024
2bcc0c8
Filter restricted world
alazeprt May 11, 2024
ec2c57b
Merge branch 'WiIIiam278:master' into master
alazeprt May 11, 2024
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
23 changes: 12 additions & 11 deletions common/src/main/java/net/william278/huskhomes/command/RtpCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,18 @@
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.*;

public class RtpCommand extends Command implements UserListTabProvider {

protected RtpCommand(@NotNull HuskHomes plugin) {
super("rtp", List.of(), "[player] [world]", plugin);
addAdditionalPermissions(Map.of(
"other", true,
"world", true
));
Map<String, Boolean> map = new HashMap<>();
map.put("other", true);
plugin.getWorlds().stream()
.filter(world -> !plugin.getSettings().getRtp().isWorldRtpRestricted(world))
.map(World::getName).toList().forEach(world -> map.put(world, true));
addAdditionalPermissions(map);
}

@Override
Expand Down Expand Up @@ -69,11 +69,12 @@ public void execute(@NotNull CommandUser executor, @NotNull String[] args) {
@Override
public List<String> suggest(@NotNull CommandUser user, @NotNull String[] args) {
return switch (args.length) {
case 0, 1 -> user.hasPermission("other") ? UserListTabProvider.super.suggestLocal(args)
case 0, 1 -> user.hasPermission(getPermission("other")) ? UserListTabProvider.super.suggestLocal(args)
: user instanceof OnlineUser online ? List.of(online.getUsername()) : List.of();
case 2 -> user.hasPermission("world") ? plugin.getWorlds().stream()
case 2 -> plugin.getWorlds().stream()
.filter(world -> !plugin.getSettings().getRtp().isWorldRtpRestricted(world))
.map(World::getName).toList() : List.of();
.map(World::getName)
.filter(world -> user.hasPermission(getPermission(world))).toList();
default -> null;
};
}
Expand Down Expand Up @@ -112,7 +113,7 @@ private Optional<World> validateRtp(@NotNull OnlineUser teleporter, @NotNull Com

// Ensure the user has permission to randomly teleport in the world
final World world = optionalWorld.get();
if (!world.equals(teleporterWorld) && !executor.hasPermission(getPermission("world"))) {
if (!world.equals(teleporterWorld) && !executor.hasPermission(getPermission(world.getName()))) {
plugin.getLocales().getLocale("error_no_permission")
.ifPresent(executor::sendMessage);
return Optional.empty();
Expand Down
Loading