18c3716c49
This enables us a fast reference to the entities current chunk instead of having to look it up by hashmap lookups. We also store counts by type to further enable other performance optimizations in later patches.
31 lines
1.3 KiB
Diff
31 lines
1.3 KiB
Diff
From 246c986d5d4681c5ab7fb23a07b8e061d389ce8c 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 2e78cd8cf..4ffe0d208 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
@@ -245,6 +245,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;
|
|
@@ -252,6 +253,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.18.0
|
|
|