OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-29 15:49:00 +01:00
Code Issues Projects Releases Packages Wiki Activity

don't try to load protochunks, we don't save them

Browse source 
no reason to try to load them when we don't save them!
This commit is contained in:
Aikar 2018-08-11 00:12:25 -04:00
parent 7c619bbae0
commit 62d26bf1d2
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -8,7 +8,7 @@ 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.
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
index ea8684747d..a97e024ec4 100644
index ea868474..a97e024e 100644
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
@@ -0,0 +0,0 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@ -20,7 +20,7 @@ index ea8684747d..a97e024ec4 100644
world.checkSession();
diff --git a/src/main/java/net/minecraft/server/ChunkTaskScheduler.java b/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
index 5d9118daa8..7629e0d054 100644
index 5d9118da..ca1516f2 100644
--- a/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
+++ b/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
@@ -0,0 +0,0 @@ public class ChunkTaskScheduler extends Scheduler<ChunkCoordIntPair, ChunkStatus
@ -32,4 +32,12 @@ index 5d9118daa8..7629e0d054 100644
}
});
@@ -0,0 +0,0 @@ public class ChunkTaskScheduler extends Scheduler<ChunkCoordIntPair, ChunkStatus
@Nullable
private ProtoChunk a(int i, int j) {
+ if (true) return null; // Paper - we don't save proto chunks
try {
return this.e.b(this.c, i, j, (ichunkaccess) -> {
});
--

2
Spigot-Server-Patches/Thread-Safe-Iteration-of-Chunk-Scheduler.patch
View file

@ -5,7 +5,7 @@ Subject: [PATCH] Thread Safe Iteration of Chunk Scheduler
diff --git a/src/main/java/net/minecraft/server/ChunkTaskScheduler.java b/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
index 7629e0d054..5ee8bedf34 100644
index ca1516f2..94ba21f9 100644
--- a/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
+++ b/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
@@ -0,0 +0,0 @@