From c1ea5502d4cfe8effb361d297b008364a4279eea Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Sat, 17 Jun 2023 11:25:22 -0700
Subject: [PATCH] Remove more outdated config settings (#9358)

---
 patches/server/0005-Paper-config-files.patch | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/patches/server/0005-Paper-config-files.patch b/patches/server/0005-Paper-config-files.patch
index 7fbde73ffb..af34e66d9a 100644
--- a/patches/server/0005-Paper-config-files.patch
+++ b/patches/server/0005-Paper-config-files.patch
@@ -1378,10 +1378,10 @@ index 0000000000000000000000000000000000000000..f6b9d216c24d8858802f85209fe1a869
 +}
 diff --git a/src/main/java/io/papermc/paper/configuration/RemovedConfigurations.java b/src/main/java/io/papermc/paper/configuration/RemovedConfigurations.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..efe7fc0bb92b70ef244875219f285724af9bfa24
+index 0000000000000000000000000000000000000000..f0d4ec73bc8872a85e34f5c6b4d342e7562ca350
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/configuration/RemovedConfigurations.java
-@@ -0,0 +1,64 @@
+@@ -0,0 +1,77 @@
 +package io.papermc.paper.configuration;
 +
 +import org.spongepowered.configurate.NodePath;
@@ -1391,6 +1391,15 @@ index 0000000000000000000000000000000000000000..efe7fc0bb92b70ef244875219f285724
 +interface RemovedConfigurations {
 +
 +    NodePath[] REMOVED_WORLD_PATHS = {
++        path("falling-blocks-collide-with-signs"),
++        path("fast-drain"),
++        path("lava-flow-speed"),
++        path("load-chunks"),
++        path("misc", "boats-drop-boats"),
++        path("player-exhaustion"),
++        path("remove-unloaded"),
++        path("tick-next-tick-list-cap"),
++        path("tick-next-tick-list-cap-ignores-redstone"),
 +        path("elytra-hit-wall-damage"),
 +        path("queue-light-updates"),
 +        path("save-queue-limit-for-auto-save"),
@@ -1406,7 +1415,7 @@ index 0000000000000000000000000000000000000000..efe7fc0bb92b70ef244875219f285724
 +        path("reset-arrow-despawn-timer-on-fall"),
 +        path("seed-based-feature-search"),
 +        path("seed-based-feature-search-loads-chunks"),
-+        path("viewdistances.no-tick-view-distance"),
++        path("viewdistances", "no-tick-view-distance"),
 +        path("seed-based-feature-search"), // unneeded as of 1.18
 +        path("seed-based-feature-search-loads-chunks"), // unneeded as of 1.18
 +        path("reset-arrow-despawn-timer-on-fall"),
@@ -1429,6 +1438,10 @@ index 0000000000000000000000000000000000000000..efe7fc0bb92b70ef244875219f285724
 +    };
 +
 +    NodePath[] REMOVED_GLOBAL_PATHS = {
++        path("data-value-allowed-items"),
++        path("effect-modifiers"),
++        path("stackable-buckets"),
++        path("async-chunks"),
 +        path("queue-light-updates-max-loss"),
 +        path("sleep-between-chunk-saves"),
 +        path("remove-invalid-statistics"),