Complete future when chunk fails to load

This commit is contained in:
Aikar 2018-10-08 21:14:13 -04:00
parent c0e1dd72da
commit a3cccc9359
No known key found for this signature in database
GPG key ID: 401ADFC9891FAAFE

View file

@ -1,4 +1,4 @@
From be56cc5d2ee5ab579c019b798637538ff0544d52 Mon Sep 17 00:00:00 2001
From 846c9756da7c128b4eaaf63c3a7404d23dd0175c Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 21 Jul 2018 16:55:04 -0400
Subject: [PATCH] Async Chunk Loading and Generation
@ -904,10 +904,10 @@ index 98d182fdb8..487d98eb1b 100644
diff --git a/src/main/java/net/minecraft/server/PaperAsyncChunkProvider.java b/src/main/java/net/minecraft/server/PaperAsyncChunkProvider.java
new file mode 100644
index 0000000000..1916bf372e
index 0000000000..dabc4184e5
--- /dev/null
+++ b/src/main/java/net/minecraft/server/PaperAsyncChunkProvider.java
@@ -0,0 +1,567 @@
@@ -0,0 +1,568 @@
+/*
+ * This file is licensed under the MIT License (MIT).
+ *
@ -1421,6 +1421,7 @@ index 0000000000..1916bf372e
+ } catch (Exception ex) {
+ MinecraftServer.LOGGER.error("Couldn't load chunk (" +world.getWorld().getName() + ":" + x + "," + z + ")", ex);
+ if (!(ex instanceof IOException)) {
+ loadFinished(null);
+ return;
+ }
+ }
@ -2198,5 +2199,5 @@ index 9c2adb2351..62c197b80d 100644
this.random = new Random(seed);
this.chunkManager = world.worldProvider.getChunkGenerator().getWorldChunkManager();
--
2.19.0
2.19.1