Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-30 06:24:06 +01:00
Code Issues Projects Releases Wiki Activity

Fix async calls to getChunkAtIfLoadedImmediately

Browse Source
This commit is contained in:
Shane Freeder 2019-06-11 04:17:39 +01:00
parent 16909a3637
commit ec405a6bea
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Spigot-Server-Patches/0004-MC-Utils.patch
View File

@ -1,4 +1,4 @@
From 8dbe084873df655de066118b90ebe479bcf299cd Mon Sep 17 00:00:00 2001 From 4f85c289931d39b1ab2d7f32021ad870ecef0000 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Mon, 28 Mar 2016 20:55:47 -0400 Date: Mon, 28 Mar 2016 20:55:47 -0400
Subject: [PATCH] MC Utils Subject: [PATCH] MC Utils
@ -182,7 +182,7 @@ index 857b2f8868..bbf136614c 100644
} }
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
index dcf2d38df5..ea73e4baba 100644 index dcf2d38df5..600217427b 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -66,6 +66,38 @@ public class ChunkProviderServer extends IChunkProvider { @@ -66,6 +66,38 @@ public class ChunkProviderServer extends IChunkProvider {
@ -196,7 +196,7 @@ index dcf2d38df5..ea73e4baba 100644
+ if (Thread.currentThread() != this.serverThread) { + if (Thread.currentThread() != this.serverThread) {
+ return CompletableFuture.supplyAsync(() -> { + return CompletableFuture.supplyAsync(() -> {
+ return this.getChunkAtIfLoadedImmediately(x, z); + return this.getChunkAtIfLoadedImmediately(x, z);
+ }).join(); + }, this.serverThreadQueue).join();
+ } + }
+ +
+ long k = ChunkCoordIntPair.pair(x, z); + long k = ChunkCoordIntPair.pair(x, z);