From 6249dd5ecba96da4b2af89625ff872d10bd30444 Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Thu, 9 Jun 2022 15:15:01 -0700
Subject: [PATCH] remove more unused config options

---
 patches/server/0004-Paper-config-files.patch | 31 +++++++++++++++-----
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/patches/server/0004-Paper-config-files.patch b/patches/server/0004-Paper-config-files.patch
index 32cce772ca..bdf77a1b28 100644
--- a/patches/server/0004-Paper-config-files.patch
+++ b/patches/server/0004-Paper-config-files.patch
@@ -1226,10 +1226,10 @@ index 0000000000000000000000000000000000000000..be64437ba7630fe069aaea502932b514
 +}
 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..70eca3b294688db4af4445b324d6b5dec988cb73
+index 0000000000000000000000000000000000000000..d69d203eea014fc9fb40a556f0771dba15fcd2ea
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/configuration/RemovedConfigurations.java
-@@ -0,0 +1,45 @@
+@@ -0,0 +1,61 @@
 +package io.papermc.paper.configuration;
 +
 +import org.spongepowered.configurate.NodePath;
@@ -1250,7 +1250,7 @@ index 0000000000000000000000000000000000000000..70eca3b294688db4af4445b324d6b5de
 +        path("lightning-strike-distance-limit"),
 +        path("fix-wither-targeting-bug"),
 +        path("remove-corrupt-tile-entities"),
-+        path("allow-leashing-undead-horse"),
++        path("allow-undead-horse-leashing"),
 +        path("reset-arrow-despawn-timer-on-fall"),
 +        path("seed-based-feature-search"),
 +        path("seed-based-feature-search-loads-chunks"),
@@ -1260,6 +1260,18 @@ index 0000000000000000000000000000000000000000..70eca3b294688db4af4445b324d6b5de
 +        path("reset-arrow-despawn-timer-on-fall"),
 +        path("squid-spawn-height"),
 +        path("viewdistances"),
++        path("use-alternate-fallingblock-onGround-detection"),
++        path("skip-entity-ticking-in-chunks-scheduled-for-unload"),
++        path("tracker-update-distance"),
++        path("allow-block-location-tab-completion"),
++        path("cache-chunk-maps"),
++        path("disable-mood-sounds"),
++        path("fix-cannons"),
++        path("player-blocking-damage-multiplier"),
++        path("remove-invalid-mob-spawner-tile-entities"),
++        path("use-hopper-check"),
++        path("use-async-lighting"),
++        path("tnt-explosion-volume"),
 +    };
 +
 +    NodePath[] REMOVED_GLOBAL_PATHS = {
@@ -1271,7 +1283,11 @@ index 0000000000000000000000000000000000000000..70eca3b294688db4af4445b324d6b5de
 +        path("save-player-data"), // to spigot (converted)
 +        path("log-named-entity-deaths"), // default in vanilla
 +        path("chunk-tasks-per-tick"), // removed in tuinity merge
-+        path("item-validation", "loc-name")
++        path("item-validation", "loc-name"),
++        path("commandErrorMessage"),
++        path("baby-zombie-movement-speed"),
++        path("limit-player-interactions"),
++        path("warnWhenSettingExcessiveVelocity")
 +    };
 +
 +}
@@ -3037,10 +3053,10 @@ 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..2de6b4fdda91e29d651ee56e6256c3466c357db0
+index 0000000000000000000000000000000000000000..da56027e1ddb0649e5b860ffa6c95af388a75442
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/configuration/transformation/world/LegacyPaperWorldConfig.java
-@@ -0,0 +1,319 @@
+@@ -0,0 +1,320 @@
 +package io.papermc.paper.configuration.transformation.world;
 +
 +import io.papermc.paper.configuration.Configuration;
@@ -3203,7 +3219,8 @@ index 0000000000000000000000000000000000000000..2de6b4fdda91e29d651ee56e6256c346
 +    }
 +
 +    private static ConfigurationTransformation newFormatTransformation() {
-+        final ConfigurationTransformation.Builder builder = ConfigurationTransformation.builder();
++        final ConfigurationTransformation.Builder builder = ConfigurationTransformation.builder()
++            .addAction(path("verbose"), TransformAction.remove()); // not needed
 +
 +        moveFromRoot(builder, "anti-xray", "anticheat");
 +