Remove Patches (#7541)

This commit is contained in:
Owen 2022-03-11 15:13:46 -05:00 committed by GitHub
parent 1790528a61
commit ea1efef116
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
857 changed files with 274 additions and 268 deletions

View file

@ -0,0 +1,36 @@
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] Upstream config migrations
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 13cd1da1277615a695f5bf92e2f7005dd99a534e..fddc40fc7b6bfbdab3ab54dae273a0d99198da5f 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -291,4 +291,23 @@ public class PaperConfig {
private static void authenticationServersDownKickMessage() {
authenticationServersDownKickMessage = Strings.emptyToNull(getString("messages.kick.authentication-servers-down", authenticationServersDownKickMessage));
}
+
+ private static void savePlayerData() {
+ Object val = config.get("settings.save-player-data");
+ if (val instanceof Boolean) {
+ SpigotConfig.disablePlayerDataSaving = !(Boolean) val;
+ SpigotConfig.config.set("players.disable-saving", SpigotConfig.disablePlayerDataSaving);
+ SpigotConfig.save();
+ config.set("settings.save-player-data", null);
+ }
+ }
+
+ 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();
+ }
+ }
}