Upstream
/
Minestom
mirror of https://github.com/Minestom/Minestom.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix test 

Signed-off-by: TheMode <themode@outlook.fr>
This commit is contained in:
TheMode 2022-01-20 04:57:41 +01:00
parent c19d2da2da
commit 7f9f33d462
2 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/main/java/net/minestom/server/entity/Player.java
View File

@ -66,6 +66,7 @@ import net.minestom.server.resourcepack.ResourcePack;
import net.minestom.server.scoreboard.BelowNameTag;
import net.minestom.server.scoreboard.Team;
import net.minestom.server.statistic.PlayerStatistic;
import net.minestom.server.timer.SchedulerManager;
import net.minestom.server.utils.MathUtils;
import net.minestom.server.utils.PacketUtils;
import net.minestom.server.utils.async.AsyncUtils;
@ -90,6 +91,7 @@ import java.nio.charset.StandardCharsets;
import java.time.Duration;
import java.util.*;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Consumer;
import java.util.function.UnaryOperator;
@ -522,21 +524,36 @@ public class Player extends LivingEntity implements CommandSender, Localizable,
List<CompletableFuture<Chunk>> futures = new ArrayList<>();
ChunkUtils.forChunksInRange(spawnPosition, MinecraftServer.getChunkViewDistance(),
(chunkX, chunkZ) -> futures.add(instance.loadOptionalChunk(chunkX, chunkZ)));
return CompletableFuture.allOf(futures.toArray(CompletableFuture[]::new))
.thenCompose(unused -> {
SchedulerManager scheduler = MinecraftServer.getSchedulerManager();
AtomicBoolean join = new AtomicBoolean();
CompletableFuture<Void> future = new CompletableFuture<>() {
@Override
public Void join() {
// Prevent deadlock
scheduler.process();
join.set(true);
final Void result = super.join();
join.set(false);
return result;
}
};
CompletableFuture.allOf(futures.toArray(CompletableFuture[]::new))
.thenRun(() -> {
if (runThread == Thread.currentThread()) {
runnable.accept(instance);
return AsyncUtils.VOID_FUTURE;
future.complete(null);
} else {
// Complete the future during the next instance tick
CompletableFuture<Void> future = new CompletableFuture<>();
instance.scheduleNextTick(i -> {
runnable.accept(i);
scheduler.scheduleNextProcess(() -> {
runnable.accept(instance);
future.complete(null);
});
return future;
if (join.compareAndSet(true, false))
scheduler.process();
}
});
return future;
}
/**

5
src/test/java/net/minestom/server/entity/EntityInstanceIntegrationTest.java
View File

@ -53,11 +53,8 @@ public class EntityInstanceIntegrationTest {
var connection = env.createConnection();
var player = connection.connect(instance, new Pos(0, 42, 0)).join();
assertEquals(instance, player.getInstance());
// #join may cause the thread to hang as scheduled for the next tick when initially in a pool
Assertions.assertTimeoutPreemptively(Duration.ofSeconds(2), () -> {
player.setInstance(instance2).join();
});
Assertions.assertTimeout(Duration.ofSeconds(2), () -> player.setInstance(instance2).join());
assertEquals(instance2, player.getInstance());
}
}