Upstream/LuckPerms
1
0
Fork 0
mirror of https://github.com/LuckPerms/LuckPerms.git synced 2024-11-30 22:53:27 +01:00
Code Issues Projects Releases Wiki Activity

Properly remove "minecraft:" prefixed brigadier aliases

Browse Source
This commit is contained in:
Luck 2019-06-03 20:15:29 +01:00
parent 4e4982a98d
commit ffe6c24b53
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bukkit/src/main/java/me/lucko/luckperms/bukkit/compat/LuckPermsBrigadier.java
View File

@ -52,7 +52,10 @@ import java.io.BufferedReader;
import java.io.InputStream; import java.io.InputStream;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.Objects; import java.util.Objects;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import java.util.zip.GZIPInputStream; import java.util.zip.GZIPInputStream;
public class LuckPermsBrigadier { public class LuckPermsBrigadier {
@ -80,18 +83,20 @@ public class LuckPermsBrigadier {
private static final class PermissionListener implements Listener { private static final class PermissionListener implements Listener {
private final LPBukkitPlugin plugin; private final LPBukkitPlugin plugin;
private final Command pluginCommand; private final List<String> aliases;
private PermissionListener(LPBukkitPlugin plugin, Command pluginCommand) { private PermissionListener(LPBukkitPlugin plugin, Command pluginCommand) {
this.plugin = plugin; this.plugin = plugin;
this.pluginCommand = pluginCommand; this.aliases = Commodore.getAliases(pluginCommand).stream()
.flatMap(alias -> Stream.of(alias, "minecraft:" + alias))
.collect(Collectors.toList());
} }
@EventHandler @EventHandler
public void onCommandSend(PlayerCommandSendEvent e) { public void onCommandSend(PlayerCommandSendEvent e) {
Sender playerAsSender = this.plugin.getSenderFactory().wrap(e.getPlayer()); Sender playerAsSender = this.plugin.getSenderFactory().wrap(e.getPlayer());
if (!this.plugin.getCommandManager().hasPermissionForAny(playerAsSender)) { if (!this.plugin.getCommandManager().hasPermissionForAny(playerAsSender)) {
e.getCommands().removeAll(Commodore.getAliases(this.pluginCommand)); e.getCommands().removeAll(this.aliases);
} }
} }
} }