2022-09-23 07:08:43 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Shane Freeder <theboyetronic@gmail.com>
|
|
|
|
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
|
2022-10-23 19:41:34 +02:00
|
|
|
index 559b876d1156c04e4e417fb07439bbbc78bea065..9903be1739a5f8657f182b641e93d8b3480f3d57 100644
|
2022-09-23 07:08:43 +02:00
|
|
|
--- a/src/main/java/org/bukkit/configuration/file/YamlConfiguration.java
|
|
|
|
+++ b/src/main/java/org/bukkit/configuration/file/YamlConfiguration.java
|
2022-10-23 19:41:34 +02:00
|
|
|
@@ -97,6 +97,7 @@ public class YamlConfiguration extends FileConfiguration {
|
2022-09-23 07:08:43 +02:00
|
|
|
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
|
2022-10-23 19:41:34 +02:00
|
|
|
index 3f7f6caf5fcf38b65c282cd83b93e45a272b138f..5d0ec7436f4487c686473248f332689224156fd5 100644
|
2022-09-23 07:08:43 +02:00
|
|
|
--- 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;
|
2022-10-23 19:41:34 +02:00
|
|
|
+ private int codePointLimit = Integer.MAX_VALUE; // Paper - use upstream's default from YamlConfiguration
|
2022-09-23 07:08:43 +02:00
|
|
|
|
|
|
|
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
|
|
|
|
}
|