32 lines
1.3 KiB
Diff
32 lines
1.3 KiB
Diff
|
From e8a422782bf1466348b1dcd40c75e8576b52c233 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Aikar <aikar@aikar.co>
|
||
|
|
Date: Sat, 7 Jan 2017 16:06:44 -0500
|
||
|
|
Subject: [PATCH] Enforce Sync Chunk Unloads
|
||
|
|
|
||
|
|
Unloading Chunks async is extremely dangerous. This will force it to main
|
||
|
|
the same way we handle async chunk loads.
|
||
|
|
|
||
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||
|
|
index 1c4040760..c678718b7 100644
|
||
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||
|
|
@@ -235,6 +235,7 @@ public class CraftWorld implements World {
|
||
|
|
}
|
||
|
|
|
||
|
|
private boolean unloadChunk0(int x, int z, boolean save) {
|
||
|
|
+ Boolean result = MCUtil.ensureMain("Unload Chunk", () -> { // Paper - Ensure never async
|
||
|
|
net.minecraft.server.Chunk chunk = world.getChunkProviderServer().getChunkIfLoaded(x, z);
|
||
|
|
if (chunk == null) {
|
||
|
|
return true;
|
||
|
|
@@ -242,6 +243,7 @@ public class CraftWorld implements World {
|
||
|
|
|
||
|
|
// If chunk had previously been queued to save, must do save to avoid loss of that data
|
||
|
|
return world.getChunkProviderServer().unloadChunk(chunk, chunk.mustSave || save);
|
||
|
|
+ }); return result != null ? result : false; // Paper - Ensure never async
|
||
|
|
}
|
||
|
|
|
||
|
|
public boolean regenerateChunk(int x, int z) {
|
||
|
|
--
|
||
|
|
2.11.0
|
||
|
|
|