SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow ProtoChunks to be loaded

Browse Source 
Reverts 62d26bf1d2
Fixes GH-1348
This commit is contained in:
Zach Brown
2018-08-23 15:40:00 -04:00
parent 7d3b4f409c
commit fdef57b439
2 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Spigot-Server-Patches/Don-t-save-Proto-Chunks.patch
View File

@@ -20,7 +20,7 @@ index ea8684747..a97e024ec 100644
world.checkSession(); world.checkSession();
diff --git a/src/main/java/net/minecraft/server/ChunkTaskScheduler.java b/src/main/java/net/minecraft/server/ChunkTaskScheduler.java 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 --- a/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
+++ b/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 @@ -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) -> {
});
-- --

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 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 --- a/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
+++ b/src/main/java/net/minecraft/server/ChunkTaskScheduler.java +++ b/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
@@ -0,0 +0,0 @@ @@ -0,0 +0,0 @@