Paper/Spigot-Server-Patches/0195-Enforce-Sync-Chunk-Unloads.patch

32 lines
1.3 KiB
Diff
Raw Normal View History

From a1e45d91d780d108a915f6d28133f7d230fd9b69 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
2017-05-14 20:05:01 +02:00
index 7e8913794..90565227e 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
2017-01-13 13:00:33 +01:00
@@ -238,6 +238,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;
2017-01-13 13:00:33 +01:00
@@ -245,6 +246,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) {
--
2017-05-21 06:41:39 +02:00
2.13.0.windows.1