@@ -26186,7 +26186,7 @@ index 9dbb7c744030fb8d6891780a0928c8cca2a2b68d..f019f1330f9f1e6aa98ef3f914833769
26186
26186
if (!passengers.equals(this.lastPassengers)) {
26187
26187
this.synchronizer
26188
26188
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
26190
26190
--- a/net/minecraft/server/level/ServerLevel.java
26191
26191
+++ b/net/minecraft/server/level/ServerLevel.java
26192
26192
@@ -175,7 +175,7 @@ import net.minecraft.world.ticks.LevelTicks;
@@ -26885,11 +26885,13 @@ index 9f88fafefa490be098b6d45cb55ae290fb435246..f79dfe4d6431de334d890759bbb84d44
26885
26885
}
26886
26886
26887
26887
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
+
26889
26890
public void waitForEntities(ChunkPos chunkPos, int radius) {
26890
26891
List<ChunkPos> list = ChunkPos.rangeClosed(chunkPos, radius).toList();
26891
- this.server.managedBlock(() -> {
26892
+ - this.server.managedBlock(() -> {
26892
26893
- this.entityManager.processPendingLoads();
26894
+ + this.chunkSource.mainThreadProcessor.managedBlock(() -> { // Paper - rewrite chunk system
26893
26895
+ //this.entityManager.processPendingLoads(); // Paper - rewrite chunk system
26894
26896
26895
26897
for (ChunkPos chunkPos1 : list) {
@@ -26961,7 +26963,7 @@ index 9f88fafefa490be098b6d45cb55ae290fb435246..f79dfe4d6431de334d890759bbb84d44
26961
26963
}
26962
26964
26963
26965
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
26965
26967
--- a/net/minecraft/server/level/ServerPlayer.java
26966
26968
+++ b/net/minecraft/server/level/ServerPlayer.java
26967
26969
@@ -201,7 +201,7 @@ import net.minecraft.world.scores.Team;
@@ -27010,6 +27012,15 @@ index b40fd308a93295f52392cf8d05673a8455667f85..be318510a571de3064b3b13187456049
27010
27012
public ServerPlayer(MinecraftServer server, ServerLevel level, GameProfile gameProfile, ClientInformation clientInformation) {
27011
27013
super(level, gameProfile);
27012
27014
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
+
27013
27024
diff --git a/net/minecraft/server/level/ThreadedLevelLightEngine.java b/net/minecraft/server/level/ThreadedLevelLightEngine.java
27014
27025
index 664d1aaf0fffd5ca649476966da2d950858279d8..db960cb5397a8840c145f200a753e5507688957b 100644
27015
27026
--- a/net/minecraft/server/level/ThreadedLevelLightEngine.java
0 commit comments