Skip to content

Commit e9fa3a7

Browse files
committed
Use correct queue when blocking on futures
See Tuinity/Moonrise@a3ac9c7
1 parent 914fb08 commit e9fa3a7

File tree

1 file changed

+15
-4
lines changed

1 file changed

+15
-4
lines changed

paper-server/patches/features/0001-Moonrise-optimisation-patches.patch

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26186,7 +26186,7 @@ index 9dbb7c744030fb8d6891780a0928c8cca2a2b68d..f019f1330f9f1e6aa98ef3f914833769
2618626186
if (!passengers.equals(this.lastPassengers)) {
2618726187
this.synchronizer
2618826188
diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
26189-
index 9f88fafefa490be098b6d45cb55ae290fb435246..f79dfe4d6431de334d890759bbb84d44653dfdcb 100644
26189+
index 9f88fafefa490be098b6d45cb55ae290fb435246..9d105729b5828bb6c601641b968f0c7cb10d45a0 100644
2619026190
--- a/net/minecraft/server/level/ServerLevel.java
2619126191
+++ b/net/minecraft/server/level/ServerLevel.java
2619226192
@@ -175,7 +175,7 @@ import net.minecraft.world.ticks.LevelTicks;
@@ -26885,11 +26885,13 @@ index 9f88fafefa490be098b6d45cb55ae290fb435246..f79dfe4d6431de334d890759bbb84d44
2688526885
}
2688626886

2688726887
public void startTickingChunk(LevelChunk chunk) {
26888-
@@ -2199,7 +2511,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
26888+
@@ -2198,8 +2510,8 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
26889+
2688926890
public void waitForEntities(ChunkPos chunkPos, int radius) {
2689026891
List<ChunkPos> list = ChunkPos.rangeClosed(chunkPos, radius).toList();
26891-
this.server.managedBlock(() -> {
26892+
- this.server.managedBlock(() -> {
2689226893
- this.entityManager.processPendingLoads();
26894+
+ this.chunkSource.mainThreadProcessor.managedBlock(() -> { // Paper - rewrite chunk system
2689326895
+ //this.entityManager.processPendingLoads(); // Paper - rewrite chunk system
2689426896

2689526897
for (ChunkPos chunkPos1 : list) {
@@ -26961,7 +26963,7 @@ index 9f88fafefa490be098b6d45cb55ae290fb435246..f79dfe4d6431de334d890759bbb84d44
2696126963
}
2696226964

2696326965
diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
26964-
index b40fd308a93295f52392cf8d05673a8455667f85..be318510a571de3064b3b13187456049bbb52cdf 100644
26966+
index b40fd308a93295f52392cf8d05673a8455667f85..a69158ea3e8c8ba35b5ff840102fd763f42e7b4f 100644
2696526967
--- a/net/minecraft/server/level/ServerPlayer.java
2696626968
+++ b/net/minecraft/server/level/ServerPlayer.java
2696726969
@@ -201,7 +201,7 @@ import net.minecraft.world.scores.Team;
@@ -27010,6 +27012,15 @@ index b40fd308a93295f52392cf8d05673a8455667f85..be318510a571de3064b3b13187456049
2701027012
public ServerPlayer(MinecraftServer server, ServerLevel level, GameProfile gameProfile, ClientInformation clientInformation) {
2701127013
super(level, gameProfile);
2701227014
this.server = server;
27015+
@@ -459,7 +489,7 @@ public class ServerPlayer extends Player {
27016+
@Override
27017+
public BlockPos adjustSpawnLocation(ServerLevel level, BlockPos pos) {
27018+
CompletableFuture<Vec3> completableFuture = PlayerSpawnFinder.findSpawn(level, pos);
27019+
- this.server.managedBlock(completableFuture::isDone);
27020+
+ level.chunkSource.mainThreadProcessor.managedBlock(completableFuture::isDone); // Paper - rewrite chunk system
27021+
return BlockPos.containing(completableFuture.join());
27022+
}
27023+
2701327024
diff --git a/net/minecraft/server/level/ThreadedLevelLightEngine.java b/net/minecraft/server/level/ThreadedLevelLightEngine.java
2701427025
index 664d1aaf0fffd5ca649476966da2d950858279d8..db960cb5397a8840c145f200a753e5507688957b 100644
2701527026
--- a/net/minecraft/server/level/ThreadedLevelLightEngine.java

0 commit comments

Comments
 (0)