mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Prepare for 1.19 dev

Browse source
This commit is contained in:
Nassim Jahnke 2022-06-07 18:52:56 +02:00
parent 276d830d22
commit cb05aa6b8b
No known key found for this signature in database
GPG key ID: 6BE3B555EBC5982B
1302 changed files with 131 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

24
patches/api/0351-System-prop-for-default-config-comment-parsing.patch
View file

@ -1,24 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Thu, 30 Dec 2021 16:35:56 -0800
Subject: [PATCH] System prop for default config comment parsing
Allows for certain legacy plugins to continue to work without changing
by setting `Paper.parseYamlCommentsByDefault` to false
diff --git a/src/main/java/org/bukkit/configuration/file/FileConfigurationOptions.java b/src/main/java/org/bukkit/configuration/file/FileConfigurationOptions.java
index c71f8a7b96fc5abc499802a79fcb3b0771de021c..121dbbf163588690d0678ae73a6ab8edf82f8367 100644
--- a/src/main/java/org/bukkit/configuration/file/FileConfigurationOptions.java
+++ b/src/main/java/org/bukkit/configuration/file/FileConfigurationOptions.java
@@ -15,7 +15,10 @@ import org.jetbrains.annotations.Nullable;
public class FileConfigurationOptions extends MemoryConfigurationOptions {
private List<String> header = Collections.emptyList();
private List<String> footer = Collections.emptyList();
- private boolean parseComments = true;
+ // Paper start - add system prop for comment parsing
+ private static final boolean PAPER_PARSE_COMMENTS_BY_DEFAULT = Boolean.parseBoolean(System.getProperty("Paper.parseYamlCommentsByDefault", "true"));
+ private boolean parseComments = PAPER_PARSE_COMMENTS_BY_DEFAULT;
+ // Paper end
protected FileConfigurationOptions(@NotNull MemoryConfiguration configuration) {
super(configuration);