From ec405a6bea8c730ac2bb73f65605687c51174763 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Tue, 11 Jun 2019 04:17:39 +0100
Subject: [PATCH] Fix async calls to getChunkAtIfLoadedImmediately

---
 Spigot-Server-Patches/0004-MC-Utils.patch | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Spigot-Server-Patches/0004-MC-Utils.patch b/Spigot-Server-Patches/0004-MC-Utils.patch
index dae44886d7..dcefd04278 100644
--- a/Spigot-Server-Patches/0004-MC-Utils.patch
+++ b/Spigot-Server-Patches/0004-MC-Utils.patch
@@ -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>
 Date: Mon, 28 Mar 2016 20:55:47 -0400
 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
-index dcf2d38df5..ea73e4baba 100644
+index dcf2d38df5..600217427b 100644
 --- a/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 {
@@ -196,7 +196,7 @@ index dcf2d38df5..ea73e4baba 100644
 +        if (Thread.currentThread() != this.serverThread) {
 +            return CompletableFuture.supplyAsync(() -> {
 +               return this.getChunkAtIfLoadedImmediately(x, z);
-+            }).join();
++            }, this.serverThreadQueue).join();
 +        }
 +
 +        long k = ChunkCoordIntPair.pair(x, z);