Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 17:07:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appears to apply and compile correctly

Paper Changes:
fe7ef7b5 Do not schedule to main for getChunkImmediately type calls (#2362)
This commit is contained in:
William Blake Galbreath
2019-07-25 20:41:56 -05:00
parent d78b851972
commit 694d9f8e15
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0052-Asynchronous-chunk-IO-and-loading.patch
View File

@@ -1,4 +1,4 @@
From d984124be7de318154ca820efc6c4f94744cf007 Mon Sep 17 00:00:00 2001
From 905033baaaa9459c844b87cd0ab60dac6bd677a6 Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Sat, 13 Jul 2019 09:23:10 -0700
Subject: [PATCH] Asynchronous chunk IO and loading
@@ -2271,10 +2271,10 @@ index 0000000000..03cb8e0b32
+
+}
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
index b465136a66..0e977a8472 100644
index d714b8d01b..27c884b6e4 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -160,11 +160,137 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -124,11 +124,137 @@ public class ChunkProviderServer extends IChunkProvider {
return playerChunk.getAvailableChunkNow();
}
@@ -2412,7 +2412,7 @@ index b465136a66..0e977a8472 100644
if (Thread.currentThread() != this.serverThread) {
return (IChunkAccess) CompletableFuture.supplyAsync(() -> {
return this.getChunkAt(i, j, chunkstatus, flag);
@@ -186,6 +312,9 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -150,6 +276,9 @@ public class ChunkProviderServer extends IChunkProvider {
CompletableFuture<Either<IChunkAccess, PlayerChunk.Failure>> completablefuture = this.getChunkFutureMainThread(i, j, chunkstatus, flag);
if (!completablefuture.isDone()) { // Paper