From 11711a201dcdccfc1fc85345a23e2dddc81cf2d8 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 7 Jan 2017 16:08:16 -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.
---
 ...rovide-E-TE-Chunk-count-stat-methods.patch | 17 ++++++++++-
 .../Enforce-Sync-Chunk-Unloads.patch          | 29 +++++++++++++++++++
 2 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 Spigot-Server-Patches/Enforce-Sync-Chunk-Unloads.patch

diff --git a/Spigot-API-Patches/Provide-E-TE-Chunk-count-stat-methods.patch b/Spigot-API-Patches/Provide-E-TE-Chunk-count-stat-methods.patch
index 1bb3d42309..ce3eed1f04 100644
--- a/Spigot-API-Patches/Provide-E-TE-Chunk-count-stat-methods.patch
+++ b/Spigot-API-Patches/Provide-E-TE-Chunk-count-stat-methods.patch
@@ -7,7 +7,7 @@ Provides counts without the ineffeciency of using .getEntities().size()
 which creates copy of the collections.
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 56f50296..63cdcdb8 100644
+index 56f50296..2b6136fd 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -0,0 +0,0 @@ import org.bukkit.util.Vector;
@@ -15,9 +15,24 @@ index 56f50296..63cdcdb8 100644
  public interface World extends PluginMessageRecipient, Metadatable {
  
 +    // Paper start
++    /**
++     * @return The amount of Entities in this world
++     */
 +    int getEntityCount();
++
++    /**
++     * @return The amount of Tile Entities in this world
++     */
 +    int getTileEntityCount();
++
++    /**
++     * @return The amount of Tickable Tile Entities in this world
++     */
 +    int getTickableTileEntityCount();
++
++    /**
++     * @return The amount of Chunks in this world
++     */
 +    int getChunkCount();
 +    // Paper end
 +
diff --git a/Spigot-Server-Patches/Enforce-Sync-Chunk-Unloads.patch b/Spigot-Server-Patches/Enforce-Sync-Chunk-Unloads.patch
new file mode 100644
index 0000000000..32955b8b84
--- /dev/null
+++ b/Spigot-Server-Patches/Enforce-Sync-Chunk-Unloads.patch
@@ -0,0 +1,29 @@
+From 0000000000000000000000000000000000000000 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
+@@ -0,0 +0,0 @@ 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;
+@@ -0,0 +0,0 @@ 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) {
+--
\ No newline at end of file