Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-02-23 07:51:52 +01:00
Code Issues Projects Releases Wiki Activity

Restore a condition I accidently removed in last build

Browse Source
This commit is contained in:
Aikar 2020-05-25 12:53:40 -04:00
parent 88a6882930
commit 78ee3b4e88
No known key found for this signature in database
GPG Key ID: 401ADFC9891FAAFE
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Spigot-Server-Patches/0532-Unload-leaked-Cached-Chunks.patch
View File

@ -18,10 +18,10 @@ We will now detect these chunks in that iteration, and automatically
add it to the unload queue when the chunk is found without any tickets. add it to the unload queue when the chunk is found without any tickets.
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
index 54e89c9cc6c47ff2c4f4dd5d4c22a391f8a3d6e0..899a49974acf60eb7a160a4b55d1ab389249d3b0 100644 index 54e89c9cc6c47ff2c4f4dd5d4c22a391f8a3d6e0..af4ffef0466966f0d333431e72163486dc3ba49d 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -898,6 +898,29 @@ public class ChunkProviderServer extends IChunkProvider { @@ -898,6 +898,33 @@ public class ChunkProviderServer extends IChunkProvider {
if (chunksTicked[0]++ % 10 == 0) this.world.getMinecraftServer().midTickLoadChunks(); // Paper if (chunksTicked[0]++ % 10 == 0) this.world.getMinecraftServer().midTickLoadChunks(); // Paper
} }
} }
@ -36,6 +36,10 @@ index 54e89c9cc6c47ff2c4f4dd5d4c22a391f8a3d6e0..899a49974acf60eb7a160a4b55d1ab38
+ if (chunkHolderStatus != null && !chunkHolderStatus.isAtLeastStatus(desiredStatus)) { + if (chunkHolderStatus != null && !chunkHolderStatus.isAtLeastStatus(desiredStatus)) {
+ return; + return;
+ } + }
+ if (playerchunk.lastActivity == 0) {
+ playerchunk.lastActivity = world.getTime();
+ return;
+ }
+ playerchunk.lastActivity = world.getTime(); + playerchunk.lastActivity = world.getTime();
+ Chunk chunk = playerchunk.getChunk(); + Chunk chunk = playerchunk.getChunk();
+ if ((chunk != null && chunk.isAnyNeighborsLoaded()) || !playerchunk.neighborPriorities.isEmpty()) { + if ((chunk != null && chunk.isAnyNeighborsLoaded()) || !playerchunk.neighborPriorities.isEmpty()) {