From 02b5ec4c7880c5a22f4add590ef559dae4d768db Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Thu, 9 Jun 2022 18:40:07 -0700
Subject: [PATCH] fix 2 more migration issues

---
 patches/server/0004-Paper-config-files.patch      |  4 ++--
 .../0252-Asynchronous-chunk-IO-and-loading.patch  | 15 ++++++++-------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/patches/server/0004-Paper-config-files.patch b/patches/server/0004-Paper-config-files.patch
index a27a5441f8..e767cfedfd 100644
--- a/patches/server/0004-Paper-config-files.patch
+++ b/patches/server/0004-Paper-config-files.patch
@@ -3067,7 +3067,7 @@ index 0000000000000000000000000000000000000000..75f612b04f872d0d014fdc40b07c1511
 +}
 diff --git a/src/main/java/io/papermc/paper/configuration/transformation/world/LegacyPaperWorldConfig.java b/src/main/java/io/papermc/paper/configuration/transformation/world/LegacyPaperWorldConfig.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..749498b349a0504270e2ba84fd8f30bd749833a7
+index 0000000000000000000000000000000000000000..4861470fee09c757874c02a2abbdf56e25404c2f
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/configuration/transformation/world/LegacyPaperWorldConfig.java
 @@ -0,0 +1,321 @@
@@ -3204,7 +3204,7 @@ index 0000000000000000000000000000000000000000..749498b349a0504270e2ba84fd8f30bd
 +                value.node("loot-tables").set(prevValue);
 +                return path.with(path.size() - 1, "treasure-maps-find-already-discovered").array();
 +            })
-+            .addAction(path("alt-item-despawn-rate"), (path, value) -> {
++            .addAction(path("alt-item-despawn-rate", "items"), (path, value) -> {
 +                if (value.isMap()) {
 +                    Map<String, Integer> rebuild = new HashMap<>();
 +                    value.childrenMap().forEach((key, node) -> {
diff --git a/patches/server/0252-Asynchronous-chunk-IO-and-loading.patch b/patches/server/0252-Asynchronous-chunk-IO-and-loading.patch
index 30347e9977..2f898cef2e 100644
--- a/patches/server/0252-Asynchronous-chunk-IO-and-loading.patch
+++ b/patches/server/0252-Asynchronous-chunk-IO-and-loading.patch
@@ -1713,10 +1713,10 @@ index 0000000000000000000000000000000000000000..058fb5a41565e6ce2acbd1f4d071a1b8
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/io/chunk/ChunkTaskManager.java b/src/main/java/com/destroystokyo/paper/io/chunk/ChunkTaskManager.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..5b3ef259cf1bff7b23654c2a3e9fc96a7ebc9a03
+index 0000000000000000000000000000000000000000..af40e473521f408aa0e112953c43bdbce164a48b
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/io/chunk/ChunkTaskManager.java
-@@ -0,0 +1,534 @@
+@@ -0,0 +1,535 @@
 +package com.destroystokyo.paper.io.chunk;
 +
 +import com.destroystokyo.paper.io.PaperFileIOThread;
@@ -1851,12 +1851,13 @@ index 0000000000000000000000000000000000000000..5b3ef259cf1bff7b23654c2a3e9fc96a
 +    }
 +
 +    public static void processConfiguration(GlobalConfiguration.AsyncChunks config) {
++        int threads = config.threads; // don't write back to config
 +        int cpus = Runtime.getRuntime().availableProcessors() / 2;
-+        if (config.threads <= 0) {
++        if (threads <= 0) {
 +            if (cpus <= 4) {
-+                config.threads = cpus <= 2 ? 1 : 2;
++                threads = cpus <= 2 ? 1 : 2;
 +            } else {
-+                config.threads = (int) Math.min(Integer.getInteger("paper.maxChunkThreads", 4), cpus / 2);
++                threads = (int) Math.min(Integer.getInteger("paper.maxChunkThreads", 4), cpus / 2);
 +            }
 +        }
 +        if (cpus == 1 && !Boolean.getBoolean("Paper.allowAsyncChunksSingleCore")) {
@@ -1869,12 +1870,12 @@ index 0000000000000000000000000000000000000000..5b3ef259cf1bff7b23654c2a3e9fc96a
 +        String sharedHostThreads = System.getenv("PAPER_ASYNC_CHUNKS_SHARED_HOST_THREADS");
 +        if (sharedHostThreads != null) {
 +            try {
-+                config.threads = Math.max(1, Math.min(config.threads, Integer.parseInt(sharedHostThreads)));
++                threads = Math.max(1, Math.min(threads, Integer.parseInt(sharedHostThreads)));
 +            } catch (NumberFormatException ignored) {}
 +        }
 +
 +        if (config.asyncChunks) {
-+            ChunkTaskManager.initGlobalLoadThreads(config.threads);
++            ChunkTaskManager.initGlobalLoadThreads(threads);
 +        }
 +    }
 +