mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-28 19:22:50 +01:00
094bb03a37
- Lots of itemstack cloning removed. Only clone if the item is actually moved - Return true when a plugin cancels inventory move item event instead of false, as false causes pulls to cycle through all items. However, pushes do not exhibit the same behavior, so this is not something plugins could of been relying on. - Add option (Default on) to cooldown hoppers when they fail to move an item due to full inventory - Skip subsequent InventoryMoveItemEvents if a plugin does not use the item after first event fire for an iteration
31 lines
1.3 KiB
Diff
31 lines
1.3 KiB
Diff
From e1c5bbdef8f6afe22c6d095ee8cbfde7b895af45 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.16.1
|
|
|