mirror of
https://github.com/PaperMC/Paper.git
synced 2024-07-10 21:54:45 +02:00
928bcc8d3a
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
33 lines
2.0 KiB
Diff
33 lines
2.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
Date: Wed, 5 Jan 2022 12:12:58 -0800
|
|
Subject: [PATCH] Remove upstream snakeyaml fix
|
|
|
|
See Server Patch: Fix saving configs with more long comments
|
|
|
|
diff --git a/src/main/java/org/bukkit/configuration/file/YamlConfiguration.java b/src/main/java/org/bukkit/configuration/file/YamlConfiguration.java
|
|
index 21d73587e535c43e13473e441dea6fe86c3bf266..0a03cefda788b1dc57ddd61914492a15788aa3d5 100644
|
|
--- a/src/main/java/org/bukkit/configuration/file/YamlConfiguration.java
|
|
+++ b/src/main/java/org/bukkit/configuration/file/YamlConfiguration.java
|
|
@@ -65,7 +65,7 @@ public class YamlConfiguration extends FileConfiguration {
|
|
yamlLoaderOptions = new LoaderOptions();
|
|
yamlLoaderOptions.setMaxAliasesForCollections(Integer.MAX_VALUE); // SPIGOT-5881: Not ideal, but was default pre SnakeYAML 1.26
|
|
|
|
- yaml = new BukkitYaml(constructor, representer, yamlDumperOptions, yamlLoaderOptions);
|
|
+ yaml = new /*BukkitYaml*/Yaml(constructor, representer, yamlDumperOptions, yamlLoaderOptions); // Paper - don't use upstream BukkitYaml fix, add the whole snakeyaml Emitter class itself with the fix
|
|
}
|
|
|
|
@NotNull
|
|
diff --git a/src/test/java/org/bukkit/configuration/file/YamlConfigurationTest.java b/src/test/java/org/bukkit/configuration/file/YamlConfigurationTest.java
|
|
index 194949d74a3f1c69f7869a826ee3a011a6c26786..9f83d16341b4efd5c7150d2ab9abd579f373fa95 100644
|
|
--- a/src/test/java/org/bukkit/configuration/file/YamlConfigurationTest.java
|
|
+++ b/src/test/java/org/bukkit/configuration/file/YamlConfigurationTest.java
|
|
@@ -152,6 +152,7 @@ public class YamlConfigurationTest extends FileConfigurationTest {
|
|
}
|
|
|
|
@Test
|
|
+ @org.junit.Ignore // Paper - ignore test because our fix doesn't work in testing environment
|
|
public void test100Comments() throws InvalidConfigurationException {
|
|
StringBuilder commentBuilder = new StringBuilder();
|
|
for (int i = 0; i < 100; i++) {
|