diff options
| author | Nassim Jahnke <[email protected]> | 2022-10-02 09:56:36 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-10-02 09:56:36 +0200 |
| commit | 928bcc8d3a058221146cea1de7d42d7e178e78f2 (patch) | |
| tree | fdb518a8812097f983c41d36ea693baf5c208554 /patches/api/0349-System-prop-for-default-config-comment-parsing.patch | |
| parent | ec3cfa9b7f147cf097692144f665893748fadc3b (diff) | |
| download | Paper-928bcc8d3a058221146cea1de7d42d7e178e78f2.tar.gz Paper-928bcc8d3a058221146cea1de7d42d7e178e78f2.zip | |
Updated Upstream (Bukkit/CraftBukkit) (#8430)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
Bukkit Changes:
09943450 Update SnakeYAML version
5515734f SPIGOT-7162: Incorrect description for Entity#getVehicle javadoc
6f82b381 PR-788: Add getHand() to all relevant events
CraftBukkit Changes:
aaf484f6f SPIGOT-7163: CraftMerchantRecipe doesn't copy demand and specialPrice from BukkitMerchantRecipe
5329dd6fd PR-1107: Add getHand() to all relevant events
93061706e SPIGOT-7045: Ocelots never spawn with babies with spawn reason OCELOT_BABY
Diffstat (limited to 'patches/api/0349-System-prop-for-default-config-comment-parsing.patch')
| -rw-r--r-- | patches/api/0349-System-prop-for-default-config-comment-parsing.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/patches/api/0349-System-prop-for-default-config-comment-parsing.patch b/patches/api/0349-System-prop-for-default-config-comment-parsing.patch new file mode 100644 index 0000000000..632f71e519 --- /dev/null +++ b/patches/api/0349-System-prop-for-default-config-comment-parsing.patch @@ -0,0 +1,24 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Jake Potrebic <[email protected]> +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); |