Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-04-07 12:46:19 +02:00
Code Issues Projects Releases Wiki Activity

Fixed the FakePlayer scheduled callback being called in an external thread

Browse Source
This commit is contained in:
themode 2020-10-31 19:59:02 +01:00
parent 9a7a1e6ff4
commit fbff3a6b0b
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/net/minestom/server/entity/fakeplayer/FakePlayer.java
View File

@ -2,7 +2,7 @@ package net.minestom.server.entity.fakeplayer;
import net.minestom.server.MinecraftServer; import net.minestom.server.MinecraftServer;
import net.minestom.server.entity.Player; import net.minestom.server.entity.Player;
import net.minestom.server.event.player.PlayerLoginEvent; import net.minestom.server.event.player.PlayerSpawnEvent;
import net.minestom.server.network.player.FakePlayerConnection; import net.minestom.server.network.player.FakePlayerConnection;
import net.minestom.server.network.player.PlayerConnection; import net.minestom.server.network.player.PlayerConnection;
import net.minestom.server.utils.time.TimeUnit; import net.minestom.server.utils.time.TimeUnit;
@ -34,19 +34,19 @@ public class FakePlayer extends Player {
* *
* @param uuid the FakePlayer uuid * @param uuid the FakePlayer uuid
* @param username the FakePlayer username * @param username the FakePlayer username
* @param scheduledCallback the callback called when the FakePlayer is finished logging * @param scheduledCallback the optional callback called when the fake player first spawn
* (1 tick after the {@link PlayerLoginEvent})
* WARNING: it will be called in the
* {@link net.minestom.server.timer.SchedulerManager} thread pool
*/ */
public static void initPlayer(@NotNull UUID uuid, @NotNull String username, public static void initPlayer(@NotNull UUID uuid, @NotNull String username,
@NotNull FakePlayerOption option, @Nullable Consumer<FakePlayer> scheduledCallback) { @NotNull FakePlayerOption option, @Nullable Consumer<FakePlayer> scheduledCallback) {
final FakePlayer fakePlayer = new FakePlayer(uuid, username, option); final FakePlayer fakePlayer = new FakePlayer(uuid, username, option);
if (scheduledCallback != null) { if (scheduledCallback != null) {
fakePlayer.addEventCallback(PlayerLoginEvent.class, fakePlayer.addEventCallback(PlayerSpawnEvent.class,
event -> MinecraftServer.getSchedulerManager().buildTask( event -> {
() -> scheduledCallback.accept(fakePlayer)).delay(1, TimeUnit.TICK).schedule()); if (event.isFirstSpawn()) {
scheduledCallback.accept(fakePlayer);
}
});
} }
} }
@ -55,9 +55,7 @@ public class FakePlayer extends Player {
* *
* @param uuid the FakePlayer uuid * @param uuid the FakePlayer uuid
* @param username the FakePlayer username * @param username the FakePlayer username
* @param scheduledCallback the callback called when the FakePlayer is finished logging * @param scheduledCallback the optional callback called when the fake player first spawn
* WARNING: it will be called in the
* {@link net.minestom.server.timer.SchedulerManager} thread pool
*/ */
public static void initPlayer(@NotNull UUID uuid, @NotNull String username, @Nullable Consumer<FakePlayer> scheduledCallback) { public static void initPlayer(@NotNull UUID uuid, @NotNull String username, @Nullable Consumer<FakePlayer> scheduledCallback) {
initPlayer(uuid, username, new FakePlayerOption(), scheduledCallback); initPlayer(uuid, username, new FakePlayerOption(), scheduledCallback);