|
74 | 74 |
|
75 | 75 | import java.io.File;
|
76 | 76 | import java.io.IOException;
|
| 77 | +import java.util.ArrayList; |
77 | 78 | import java.util.Collection;
|
78 | 79 | import java.util.EnumSet;
|
79 | 80 | import java.util.List;
|
@@ -526,15 +527,12 @@ public Enchantment getEnchantment(CommandContext<CommandSourceStack> cmdCtx, Str
|
526 | 527 | @Override
|
527 | 528 | public EntitySelectorParser getEntitySelector(CommandContext<CommandSourceStack> cmdCtx, String key) {
|
528 | 529 | return parse(cmdCtx, key,
|
529 |
| - (ctx, name) -> { |
530 |
| - EntitySelectorParser parser = new EntitySelectorParser( |
531 |
| - () -> ctx.getArgument(name, PlayerSelectorArgumentResolver.class).resolve((CommandSourceStack) ctx.getSource()).getFirst(), |
532 |
| - () -> ctx.getArgument(name, EntitySelectorArgumentResolver.class).resolve((CommandSourceStack) ctx.getSource()).getFirst(), |
533 |
| - (allowEmpty) -> ctx.getArgument(name, PlayerSelectorArgumentResolver.class).resolve((CommandSourceStack) ctx.getSource()), |
534 |
| - (allowEmpty) -> ctx.getArgument(name, EntitySelectorArgumentResolver.class).resolve((CommandSourceStack) ctx.getSource()) |
535 |
| - ); |
536 |
| - return parser; |
537 |
| - }, |
| 530 | + (ctx, name) -> new EntitySelectorParser( |
| 531 | + () -> ctx.getArgument(name, PlayerSelectorArgumentResolver.class).resolve(ctx.getSource()).getFirst(), |
| 532 | + () -> ctx.getArgument(name, EntitySelectorArgumentResolver.class).resolve(ctx.getSource()).getFirst(), |
| 533 | + (allowEmpty) -> ctx.getArgument(name, PlayerSelectorArgumentResolver.class).resolve(ctx.getSource()), |
| 534 | + (allowEmpty) -> ctx.getArgument(name, EntitySelectorArgumentResolver.class).resolve(ctx.getSource()) |
| 535 | + ), |
538 | 536 | (ctx, name) -> paperNMS.<CommandSourceStack>bukkitNMS().getEntitySelector(ctx, name)
|
539 | 537 | );
|
540 | 538 | }
|
@@ -903,7 +901,7 @@ public List<PlayerProfile> getProfile(CommandContext<CommandSourceStack> cmdCtx,
|
903 | 901 | return parseT(cmdCtx, key,
|
904 | 902 | (ctx, name) -> {
|
905 | 903 | PlayerProfileListResolver profileListResolver = ctx.getArgument(name, PlayerProfileListResolver.class);
|
906 |
| - return profileListResolver.resolve((CommandSourceStack) ctx).stream().toList(); |
| 904 | + return new ArrayList<>(profileListResolver.resolve(ctx.getSource())); |
907 | 905 | },
|
908 | 906 | (ctx, name) -> ((PaperNMS<CommandSourceStack>) paperNMS).getProfile(ctx, name)
|
909 | 907 | );
|
|
0 commit comments