From 18178d7c9ae9d638d6ed68e4dbf41545af1ce375 Mon Sep 17 00:00:00 2001
From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
Date: Fri, 13 Aug 2021 13:24:25 -0700
Subject: [PATCH] Add config migration for named entity death logging option
 (#6390)

---
 ...le.patch => Upstream-config-migrations.patch} | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)
 rename patches/server/{Make-player-data-saving-configurable.patch => Upstream-config-migrations.patch} (70%)

diff --git a/patches/server/Make-player-data-saving-configurable.patch b/patches/server/Upstream-config-migrations.patch
similarity index 70%
rename from patches/server/Make-player-data-saving-configurable.patch
rename to patches/server/Upstream-config-migrations.patch
index 1235f17e1c5..f55f78a2ec4 100644
--- a/patches/server/Make-player-data-saving-configurable.patch
+++ b/patches/server/Upstream-config-migrations.patch
@@ -1,11 +1,10 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Mon, 26 Mar 2018 18:30:53 +0300
-Subject: [PATCH] Make player data saving configurable
+Subject: [PATCH] Upstream config migrations
 
-Upstream has added a patch which negates the need for this patch,
-however, we should still migrate our configuration back upstream,
-to prevent unexpected situations
+This patch contains config migrations for when upstream adds options
+which Paper already had.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
@@ -23,5 +22,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +            SpigotConfig.config.set("players.disable-saving", SpigotConfig.disableAdvancementSaving);
 +            SpigotConfig.save();
 +        }
++    }
++
++    private static void namedEntityDeaths() {
++        Object val = config.get("settings.log-named-entity-deaths");
++        if (val instanceof Boolean bool && !bool) {
++            SpigotConfig.logNamedDeaths = false;
++            SpigotConfig.config.set("settings.log-named-deaths", false);
++            SpigotConfig.save();
++        }
 +    }
  }