mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix logic issue with no save proto chunks patch

Browse source 
Should be returning true as a no-op "yes it was saved" rather than false
as a "there was an issue saving"
This commit is contained in:
Zach Brown 2019-05-16 16:53:17 -05:00
parent 2f4fe0962b
commit 24a5bfb9cb
No known key found for this signature in database
GPG key ID: CC9DA35FC5450B76
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Spigot-Server-Patches/0261-Don-t-save-Proto-Chunks.patch
View file

@ -1,4 +1,4 @@
From e4d1232c82e9f706a4e6f3ca918109cedfeb3121 Mon Sep 17 00:00:00 2001 From c4f30faf555c8e76cf429c5229bbe21876327b87 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Sun, 22 Jul 2018 21:21:41 -0400 Date: Sun, 22 Jul 2018 21:21:41 -0400
Subject: [PATCH] Don't save Proto Chunks Subject: [PATCH] Don't save Proto Chunks
@ -8,14 +8,14 @@ the loadChunk method refuses to acknoledge they exists, and will restart
a new chunk generation process to begin with, so saving them serves no benefit. a new chunk generation process to begin with, so saving them serves no benefit.
diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
index c7bc4cc363..2244d65ee6 100644 index c7bc4cc36..1cf516192 100644
--- a/src/main/java/net/minecraft/server/PlayerChunkMap.java --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
+++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
@@ -588,6 +588,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { @@ -588,6 +588,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
} }
public boolean saveChunk(IChunkAccess ichunkaccess, boolean save) { public boolean saveChunk(IChunkAccess ichunkaccess, boolean save) {
+ if (ichunkaccess.getChunkStatus().getType() == ChunkStatus.Type.PROTOCHUNK) { return false; } // Paper - don't save proto chunks + if (ichunkaccess.getChunkStatus().getType() == ChunkStatus.Type.PROTOCHUNK) { return true; } // Paper - don't save proto chunks
// CraftBukkit end // CraftBukkit end
this.n.a(ichunkaccess.getPos()); this.n.a(ichunkaccess.getPos());
if (!save) { // CraftBukkit if (!save) { // CraftBukkit