From 62d26bf1d2c345d53f69a14058884335951f4413 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 11 Aug 2018 00:12:25 -0400
Subject: [PATCH] don't try to load protochunks, we don't save them

no reason to try to load them when we don't save them!
---
 Spigot-Server-Patches/Don-t-save-Proto-Chunks.patch  | 12 ++++++++++--
 .../Thread-Safe-Iteration-of-Chunk-Scheduler.patch   |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/Spigot-Server-Patches/Don-t-save-Proto-Chunks.patch b/Spigot-Server-Patches/Don-t-save-Proto-Chunks.patch
index 6647d4c105..027996fd92 100644
--- a/Spigot-Server-Patches/Don-t-save-Proto-Chunks.patch
+++ b/Spigot-Server-Patches/Don-t-save-Proto-Chunks.patch
@@ -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) -> {
+             });
 --
\ No newline at end of file
diff --git a/Spigot-Server-Patches/Thread-Safe-Iteration-of-Chunk-Scheduler.patch b/Spigot-Server-Patches/Thread-Safe-Iteration-of-Chunk-Scheduler.patch
index 1f14c90e3d..ef51193891 100644
--- a/Spigot-Server-Patches/Thread-Safe-Iteration-of-Chunk-Scheduler.patch
+++ b/Spigot-Server-Patches/Thread-Safe-Iteration-of-Chunk-Scheduler.patch
@@ -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 @@