Skip to content

Commit 86d13f7

Browse files
authored
Fix folia support (#629)
1 parent 333c0e4 commit 86d13f7

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

litecommands-bukkit/src/dev/rollczi/litecommands/bukkit/LiteBukkitFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ private static <B extends LiteCommandsBaseBuilder<CommandSender, LiteBukkitSetti
9191
.argument(Player.class, new PlayerArgument(server, messageRegistry))
9292
.argument(World.class, new WorldArgument(server, messageRegistry))
9393
.argument(Location.class, new LocationArgument(messageRegistry))
94-
.argument(OfflinePlayer.class, new OfflinePlayerArgument(server, plugin, messageRegistry, settings.isParseUnknownPlayersAllowed(), settings.getPlayerNamePattern()));
94+
.argument(OfflinePlayer.class, new OfflinePlayerArgument(server, plugin, messageRegistry, settings.isParseUnknownPlayersAllowed(), settings.getPlayerNamePattern(), internal.getScheduler()));
9595

9696
if (namespacedKeyClass != null) {
9797
builder.argument(namespacedKeyClass, new NamespacedKeyArgument(plugin, messageRegistry));

litecommands-bukkit/src/dev/rollczi/litecommands/bukkit/argument/OfflinePlayerArgument.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
import dev.rollczi.litecommands.argument.parser.ParseResult;
55
import dev.rollczi.litecommands.argument.resolver.ArgumentResolver;
66
import dev.rollczi.litecommands.bukkit.LiteBukkitMessages;
7-
import dev.rollczi.litecommands.bukkit.LiteBukkitSettings;
87
import dev.rollczi.litecommands.invocation.Invocation;
98
import dev.rollczi.litecommands.message.MessageRegistry;
9+
import dev.rollczi.litecommands.scheduler.Scheduler;
10+
import dev.rollczi.litecommands.scheduler.SchedulerType;
1011
import dev.rollczi.litecommands.suggestion.SuggestionContext;
1112
import dev.rollczi.litecommands.suggestion.SuggestionResult;
1213
import java.util.TreeSet;
1314
import java.util.regex.Pattern;
1415

15-
import org.bukkit.Bukkit;
1616
import org.bukkit.OfflinePlayer;
1717
import org.bukkit.Server;
1818
import org.bukkit.command.CommandSender;
@@ -31,14 +31,14 @@ public class OfflinePlayerArgument extends ArgumentResolver<CommandSender, Offli
3131
private final Pattern playerNamePattern;
3232
private final TreeSet<String> nicknames = new TreeSet<>(String.CASE_INSENSITIVE_ORDER);
3333

34-
public OfflinePlayerArgument(Server server, Plugin plugin, MessageRegistry<CommandSender> messageRegistry, boolean allowParseUnknownPlayers, Pattern playerNamePattern) {
34+
public OfflinePlayerArgument(Server server, Plugin plugin, MessageRegistry<CommandSender> messageRegistry, boolean allowParseUnknownPlayers, Pattern playerNamePattern, Scheduler scheduler) {
3535
this.server = server;
3636
this.messageRegistry = messageRegistry;
3737
this.allowParseUnknownPlayers = allowParseUnknownPlayers;
3838
this.playerNamePattern = playerNamePattern;
3939

4040
// Server#getOfflinePlayers() can be blocking, so we don't want to call it every time
41-
Bukkit.getScheduler().runTask(plugin, () -> {
41+
scheduler.run(SchedulerType.MAIN, () -> {
4242
nicknames.clear();
4343
for (OfflinePlayer player : server.getOfflinePlayers()) {
4444
final String name = player.getName();

0 commit comments

Comments
 (0)