diff options
author | Spottedleaf <[email protected]> | 2022-09-26 01:02:51 -0700 |
---|---|---|
committer | GitHub <[email protected]> | 2022-09-26 01:02:51 -0700 |
commit | 01a13871deefa50e186a10b63f71c5e0459e7d30 (patch) | |
tree | caf7056fa3ad155645b2dec6046b13841eb5d4a2 /patches/server/0763-Fix-removing-recipes-from-RecipeIterator.patch | |
parent | abe53a7eb477664aba5f32ff22d81f11ed48a44d (diff) | |
download | Paper-01a13871deefa50e186a10b63f71c5e0459e7d30.tar.gz Paper-01a13871deefa50e186a10b63f71c5e0459e7d30.zip |
Rewrite chunk system (#8177)
Patch documentation to come
Issues with the old system that are fixed now:
- World generation does not scale with cpu cores effectively.
- Relies on the main thread for scheduling and maintaining chunk state, dropping chunk load/generate rates at lower tps.
- Unreliable prioritisation of chunk gen/load calls that block the main thread.
- Shutdown logic is utterly unreliable, as it has to wait for all chunks to unload - is it guaranteed that the chunk system is in a state on shutdown that it can reliably do this? Watchdog shutdown also typically failed due to thread checks, which is now resolved.
- Saving of data is not unified (i.e can save chunk data without saving entity data, poses problems for desync if shutdown is really abnormal.
- Entities are not loaded with chunks. This caused quite a bit of headache for Chunk#getEntities API, but now the new chunk system loads entities with chunks so that they are ready whenever the chunk loads in. Effectively brings the behavior back to 1.16 era, but still storing entities in their own separate regionfiles.
The above list is not complete. The patch documentation will complete it.
New chunk system hard relies on starlight and dataconverter, and most importantly the new concurrent utilities in ConcurrentUtil.
Some of the old async chunk i/o interface (i.e the old file io thread reroutes _some_ calls to the new file io thread) is kept for plugin compat reasons. It will be removed in the next major version of minecraft.
The old legacy chunk system patches have been moved to the removed folder in case we need them again.
Diffstat (limited to 'patches/server/0763-Fix-removing-recipes-from-RecipeIterator.patch')
-rw-r--r-- | patches/server/0763-Fix-removing-recipes-from-RecipeIterator.patch | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/patches/server/0763-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0763-Fix-removing-recipes-from-RecipeIterator.patch new file mode 100644 index 0000000000..5784fd4dc3 --- /dev/null +++ b/patches/server/0763-Fix-removing-recipes-from-RecipeIterator.patch @@ -0,0 +1,49 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Jake <[email protected]> +Date: Tue, 30 Nov 2021 12:01:56 -0800 +Subject: [PATCH] Fix removing recipes from RecipeIterator + + +diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/RecipeIterator.java b/src/main/java/org/bukkit/craftbukkit/inventory/RecipeIterator.java +index 24f336c89b548c5ba2a95372db0d7c83b5c4ec47..91895c639c33a1cafd2a35bab7b5fd83e558468d 100644 +--- a/src/main/java/org/bukkit/craftbukkit/inventory/RecipeIterator.java ++++ b/src/main/java/org/bukkit/craftbukkit/inventory/RecipeIterator.java +@@ -11,6 +11,7 @@ import org.bukkit.inventory.Recipe; + public class RecipeIterator implements Iterator<Recipe> { + private final Iterator<Map.Entry<RecipeType<?>, Object2ObjectLinkedOpenHashMap<ResourceLocation, net.minecraft.world.item.crafting.Recipe<?>>>> recipes; + private Iterator<net.minecraft.world.item.crafting.Recipe<?>> current; ++ private Recipe currentRecipe; // Paper - fix removing recipes + + public RecipeIterator() { + this.recipes = MinecraftServer.getServer().getRecipeManager().recipes.entrySet().iterator(); +@@ -34,10 +35,16 @@ public class RecipeIterator implements Iterator<Recipe> { + public Recipe next() { + if (this.current == null || !this.current.hasNext()) { + this.current = this.recipes.next().getValue().values().iterator(); +- return this.next(); ++ // Paper start - fix removing recipes ++ this.currentRecipe = this.next(); ++ return this.currentRecipe; ++ // Paper end + } + +- return this.current.next().toBukkitRecipe(); ++ // Paper start - fix removing recipes ++ this.currentRecipe = this.current.next().toBukkitRecipe(); ++ return this.currentRecipe; ++ // Paper end + } + + @Override +@@ -46,6 +53,11 @@ public class RecipeIterator implements Iterator<Recipe> { + throw new IllegalStateException("next() not yet called"); + } + ++ // Paper start - fix removing recipes ++ if (this.currentRecipe instanceof org.bukkit.Keyed keyed) { ++ MinecraftServer.getServer().getRecipeManager().byName.remove(org.bukkit.craftbukkit.util.CraftNamespacedKey.toMinecraft(keyed.getKey())); ++ } ++ // Paper end + this.current.remove(); + } + } |