Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-22 17:07:34 +01:00
Code Issues Projects Releases Wiki Activity

Revert "Fix PaperTickList" (#6216)

Browse Source 
This commit reverts a5acf367a3
This commit is contained in:
Nassim Jahnke 2021-07-17 21:57:00 +02:00 committed by GitHub
parent b1cdc1274c
commit 8f949511b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
patches/server/0388-Optimise-TickListServer-by-rewriting-it.patch
View File

@ -924,7 +924,7 @@ index 1dd1b9afaee38fdc994ad0a069bd63b02eedf55c..8104b9be5a8e8d57f6f50475788aec6a
}); });
// Paper end // Paper end
diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
index 550338a7170437415342df7bc1b0a5c445480300..57aa6d18d181c50071bcfcc933cde9fa828be792 100644 index 550338a7170437415342df7bc1b0a5c445480300..34174c3cdcb69c96e8601e28ecaf01df9b8c0f37 100644
--- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java --- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
+++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java +++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
@@ -219,6 +219,13 @@ public class ServerChunkCache extends ChunkSource { @@ -219,6 +219,13 @@ public class ServerChunkCache extends ChunkSource {
@ -935,7 +935,7 @@ index 550338a7170437415342df7bc1b0a5c445480300..57aa6d18d181c50071bcfcc933cde9fa
+ public final boolean isPositionTickingWithEntitiesLoaded(BlockPos pos) { + public final boolean isPositionTickingWithEntitiesLoaded(BlockPos pos) {
+ long position = net.minecraft.server.MCUtil.getCoordinateKey(pos); + long position = net.minecraft.server.MCUtil.getCoordinateKey(pos);
+ ChunkHolder chunkHolder = this.chunkMap.getUpdatingChunkIfPresent(position); + 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 + // Paper end - rewrite ticklistserver