From 039952aa5e6f3155de9877ffe8583954038b0fe9 Mon Sep 17 00:00:00 2001 From: Nassim Jahnke Date: Sat, 17 Jul 2021 21:57:00 +0200 Subject: [PATCH] Revert "Fix PaperTickList" (#6216) This commit reverts https://github.com/PaperMC/Paper/commit/b166af8801988c2e8369aa84a0cf8c2eda542848 --- patches/server/Optimise-TickListServer-by-rewriting-it.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches/server/Optimise-TickListServer-by-rewriting-it.patch b/patches/server/Optimise-TickListServer-by-rewriting-it.patch index 179b3f2203..cf481abdc6 100644 --- a/patches/server/Optimise-TickListServer-by-rewriting-it.patch +++ b/patches/server/Optimise-TickListServer-by-rewriting-it.patch @@ -935,7 +935,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + public final boolean isPositionTickingWithEntitiesLoaded(BlockPos pos) { + long position = net.minecraft.server.MCUtil.getCoordinateKey(pos); + ChunkHolder chunkHolder = this.chunkMap.getUpdatingChunkIfPresent(position); -+ return chunkHolder != null && chunkHolder.isTickingReady() && this.level.entityManager.areEntitiesLoaded(position); ++ return chunkHolder != null && chunkHolder.isTickingReady() /* && this.level.entityManager.areEntitiesLoaded(position) */; // TODO Needs to wait for entities, but has to be manually marked as ready + } + // Paper end - rewrite ticklistserver