mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-23 09:27:45 +01:00
2f92d4e00e
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: 01bb6ba7 PR-936: Add new PersistentDataContainer methods and clean up docs bc145b90 PR-940: Create registry for banner pattern and cat type CraftBukkit Changes: cb2ea54de SPIGOT-7440, PR-1292: Fire EntityTeleportEvent for end gateways 4fea66e44 PR-1299: Add new PersistentDataContainer methods and clean up docs b483a20db PR-1303: Create registry for banner pattern and cat type 4642dd526 SPIGOT-7535: Fix maps not having an ID and also call MapInitializeEvent in more places
62 lines
2.8 KiB
Diff
62 lines
2.8 KiB
Diff
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
|
|
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
|
|
}
|