diff options
author | Shane Freeder <[email protected]> | 2024-05-09 14:51:33 +0100 |
---|---|---|
committer | Shane Freeder <[email protected]> | 2024-05-09 14:51:33 +0100 |
commit | 3693bbdc6b65e68db10375d3eeab70f06708b729 (patch) | |
tree | 4a71a5e6e5f50b3e2937053a5d4b4196ef67665b /patches/api/0329-System-prop-for-default-config-comment-parsing.patch | |
parent | f2512b12385961f8ca1f69efebe5ed0e00c0caa8 (diff) | |
download | Paper-3693bbdc6b65e68db10375d3eeab70f06708b729.tar.gz Paper-3693bbdc6b65e68db10375d3eeab70f06708b729.zip |
Use internals for getting block/entity countstimings/use-internals
For a long time I've been meaning to move some of this logic internally
as this would allow us to avoid hitting systems like block state snapshots
which can create issues as many of the spigot implementations of this
stuff are increasingly broken, leading to unexpected crashes during ticking,
even if the API cannot properly interact with these such states/items,
it's generally more preferable to not crash the server in the course,
and just let those interactions fail more gracefully.
Diffstat (limited to 'patches/api/0329-System-prop-for-default-config-comment-parsing.patch')
-rw-r--r-- | patches/api/0329-System-prop-for-default-config-comment-parsing.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/patches/api/0329-System-prop-for-default-config-comment-parsing.patch b/patches/api/0329-System-prop-for-default-config-comment-parsing.patch new file mode 100644 index 0000000000..632f71e519 --- /dev/null +++ b/patches/api/0329-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); |