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

Update upstream CB/S

Browse Source
This commit is contained in:
Zach Brown
2017-06-18 20:36:55 -05:00
parent 43e2c9c48c
commit 1c208bf05b
147 changed files with 327 additions and 347 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Spigot-Server-Patches/Ensure-Chunks-never-ever-load-async.patch
View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Ensure Chunks never ever load async
Safely pushes the operation to main thread, then back to the posting thread
diff --git a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
index 7b7a3d01b..9aaca21a7 100644
index 7b7a3d01..9aaca21a 100644
--- a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
+++ b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
@@ -0,0 +0,0 @@ import com.destroystokyo.paper.PaperConfig;
@@ -27,7 +27,7 @@ index 7b7a3d01b..9aaca21a7 100644
public static void queueChunkLoad(World world, ChunkRegionLoader loader, ChunkProviderServer provider, int x, int z, Runnable runnable) {
diff --git a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
index b5efb9c3f..ef9529add 100644
index b5efb9c3..ef9529ad 100644
--- a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
+++ b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
@@ -0,0 +0,0 @@ class ChunkIOProvider implements AsynchronousExecutor.CallBackProvider<QueuedChu