From fdef57b4392c788e720551fc8391d2fbdf9210a0 Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Thu, 23 Aug 2018 15:40:00 -0400
Subject: [PATCH] Allow ProtoChunks to be loaded

Reverts 62d26bf1d2c345d53f69a14058884335951f4413
Fixes GH-1348
---
 Spigot-Server-Patches/Don-t-save-Proto-Chunks.patch    | 10 +---------
 .../Thread-Safe-Iteration-of-Chunk-Scheduler.patch     |  2 +-
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/Spigot-Server-Patches/Don-t-save-Proto-Chunks.patch b/Spigot-Server-Patches/Don-t-save-Proto-Chunks.patch
index b2ba92a4c..0bed41665 100644
--- a/Spigot-Server-Patches/Don-t-save-Proto-Chunks.patch
+++ b/Spigot-Server-Patches/Don-t-save-Proto-Chunks.patch
@@ -20,7 +20,7 @@ index ea8684747..a97e024ec 100644
          world.checkSession();
  
 diff --git a/src/main/java/net/minecraft/server/ChunkTaskScheduler.java b/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
-index 5d9118daa..ca1516f2a 100644
+index 5d9118daa..7629e0d05 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,12 +32,4 @@ index 5d9118daa..ca1516f2a 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 439e3786f..19f5ecd23 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 ca1516f2a..94ba21f92 100644
+index 7629e0d05..5ee8bedf3 100644
 --- a/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
 +++ b/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
 @@ -0,0 +0,0 @@