Fix more compile issues

1 files changed, 61 insertions, 0 deletions

diff --git a/patches/api/0367-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch b/patches/api/0367-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch
new file mode 100644
index 0000000000..9b5ef25cf4
--- /dev/null
+++ b/patches/api/0367-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch
@@ -0,0 +1,61 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Shane Freeder <[email protected]>
+Date: Thu, 22 Sep 2022 07:04:30 +0100
+Subject: [PATCH] Expose codepoint limit in YamlConfigOptions, and increase
+ default
+
+
+diff --git a/src/main/java/org/bukkit/configuration/file/YamlConfiguration.java b/src/main/java/org/bukkit/configuration/file/YamlConfiguration.java
+index a090ef390dddd546ebf323aee4545cbe9950e098..488e4931006d12700782c76766876e3863308775 100644
+--- a/src/main/java/org/bukkit/configuration/file/YamlConfiguration.java
++++ b/src/main/java/org/bukkit/configuration/file/YamlConfiguration.java
+@@ -97,6 +97,7 @@ public class YamlConfiguration extends FileConfiguration {
+     public void loadFromString(@NotNull String contents) throws InvalidConfigurationException {
+         Preconditions.checkArgument(contents != null, "Contents cannot be null");
+         yamlLoaderOptions.setProcessComments(options().parseComments());
++        yamlLoaderOptions.setCodePointLimit(options().codePointLimit()); // Paper
+ 
+         MappingNode node;
+         try (Reader reader = new UnicodeReader(new ByteArrayInputStream(contents.getBytes(StandardCharsets.UTF_8)))) {
+diff --git a/src/main/java/org/bukkit/configuration/file/YamlConfigurationOptions.java b/src/main/java/org/bukkit/configuration/file/YamlConfigurationOptions.java
+index 3f7f6caf5fcf38b65c282cd83b93e45a272b138f..5d0ec7436f4487c686473248f332689224156fd5 100644
+--- a/src/main/java/org/bukkit/configuration/file/YamlConfigurationOptions.java
++++ b/src/main/java/org/bukkit/configuration/file/YamlConfigurationOptions.java
+@@ -12,6 +12,7 @@ import org.jetbrains.annotations.Nullable;
+ public class YamlConfigurationOptions extends FileConfigurationOptions {
+     private int indent = 2;
+     private int width = 80;
++    private int codePointLimit = Integer.MAX_VALUE; // Paper - use upstream's default from YamlConfiguration
+ 
+     protected YamlConfigurationOptions(@NotNull YamlConfiguration configuration) {
+         super(configuration);
+@@ -122,4 +123,29 @@ public class YamlConfigurationOptions extends FileConfigurationOptions {
+         this.width = value;
+         return this;
+     }
++
++    // Paper start
++    /**
++     * Gets the maximum code point limit, that being, the maximum length of the document
++     * in which the loader will read
++     *
++     * @return The current value
++     */
++    public int codePointLimit() {
++        return codePointLimit;
++    }
++
++    /**
++     * Sets the maximum code point limit, that being, the maximum length of the document
++     * in which the loader will read
++     *
++     * @param codePointLimit new codepoint limit
++     * @return This object, for chaining
++     */
++    @NotNull
++    public YamlConfigurationOptions codePointLimit(int codePointLimit) {
++        this.codePointLimit = codePointLimit;
++        return this;
++    }
++    // Paper end
+ }