Compare commits

...

6 Commits

Author SHA1 Message Date
Auxilor
d7fce6834c Updated to 6.35.3 2022-05-03 13:05:41 +01:00
Auxilor
ac807a991b Players can no longer tab-complete commands they don't have permission for 2022-05-03 13:05:32 +01:00
Auxilor
ba315ced3c Updated to 6.35.2 2022-04-29 22:45:42 +01:00
Auxilor
f2e65174f9 Reverted to old block vein code 2022-04-29 22:45:02 +01:00
Auxilor
d5584e863b Updated to 6.35.1 2022-04-27 18:52:39 +01:00
Auxilor
d9c0e8e763 Fixed overload resolution ambiguity 2022-04-27 18:52:27 +01:00
4 changed files with 19 additions and 19 deletions

View File

@@ -167,7 +167,10 @@ abstract class HandledCommand implements CommandBase {
StringUtil.copyPartialMatches(
args[0],
this.getSubcommands().stream().map(CommandBase::getName).collect(Collectors.toList()),
this.getSubcommands().stream()
.filter(subCommand -> sender.hasPermission(subCommand.getPermission()))
.map(CommandBase::getName)
.collect(Collectors.toList()),
completions
);
@@ -182,6 +185,10 @@ abstract class HandledCommand implements CommandBase {
HandledCommand command = null;
for (CommandBase subcommand : this.getSubcommands()) {
if (!sender.hasPermission(subcommand.getPermission())) {
continue;
}
if (args[0].equalsIgnoreCase(subcommand.getName())) {
command = (HandledCommand) subcommand;
}

View File

@@ -23,26 +23,25 @@ public final class BlockUtils {
*/
private static final int MAX_BLOCKS = 2500;
private static Set<Block> getNearbyBlocks(@NotNull final Block origin,
private static Set<Block> getNearbyBlocks(@NotNull final Block start,
@NotNull final List<Material> allowedMaterials,
@NotNull final Set<Block> blocks,
final int limit) {
for (BlockFace face : BlockFace.values()) {
Block block = origin.getRelative(face);
if (!allowedMaterials.contains(block.getType())) {
continue;
}
Block block = start.getRelative(face);
if (blocks.contains(block)) {
continue;
}
if (blocks.size() >= limit || blocks.size() > MAX_BLOCKS) {
return blocks;
}
if (allowedMaterials.contains(block.getType())) {
blocks.add(block);
blocks.addAll(getNearbyBlocks(block, allowedMaterials, blocks, limit));
if (blocks.size() > limit || blocks.size() > MAX_BLOCKS) {
return blocks;
}
blocks.addAll(getNearbyBlocks(block, allowedMaterials, blocks, limit));
}
}
return blocks;

View File

@@ -32,12 +32,6 @@ fun CommandSender.asAudience(): Audience =
fun Player.runExempted(action: () -> Unit) =
PlayerUtils.runExempted(this, action)
/**
* @see PlayerUtils.runExempted
*/
fun Player.runExempted(action: (Player) -> Unit) =
PlayerUtils.runExempted(this, action)
/**
* @see PlayerUtils.tryAsPlayer
*/

View File

@@ -1,3 +1,3 @@
version = 6.35.0
version = 6.35.3
plugin-name = eco
kotlin.code.style = official