diff --git a/current-paper b/current-paper index 9d178c07f..f57744ffc 100644 --- a/current-paper +++ b/current-paper @@ -1 +1 @@ -1.15.2--1f0191679be9b59b0ef50697095c0afeac3c4381 +1.15.2--332647fe7fd1d921cbadf5e3c0bd2256200ed355 diff --git a/patches/server/0102-Suppress-pointless-error-while-deserializing-warning.patch b/patches/server/0102-Suppress-pointless-error-while-deserializing-warning.patch new file mode 100644 index 000000000..fc5eb3cd4 --- /dev/null +++ b/patches/server/0102-Suppress-pointless-error-while-deserializing-warning.patch @@ -0,0 +1,34 @@ +From 28a68e1f77a186939aee0af49e3421f05dac4ab7 Mon Sep 17 00:00:00 2001 +From: William Blake Galbreath +Date: Sat, 1 Feb 2020 22:29:11 -0600 +Subject: [PATCH] Suppress pointless 'error while deserializing' warning + +--- + .../java/net/minecraft/server/WorldGenFeatureConfigured.java | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureConfigured.java b/src/main/java/net/minecraft/server/WorldGenFeatureConfigured.java +index de8f1874af..09eaecf9e8 100644 +--- a/src/main/java/net/minecraft/server/WorldGenFeatureConfigured.java ++++ b/src/main/java/net/minecraft/server/WorldGenFeatureConfigured.java +@@ -25,7 +25,7 @@ public class WorldGenFeatureConfigured a(WorldGenDecoratorConfigured worldgendecoratorconfigured) { + WorldGenerator worldgenerator = this.b instanceof WorldGenFlowers ? WorldGenerator.DECORATED_FLOWER : WorldGenerator.DECORATED; + +- return worldgenerator.b((WorldGenFeatureConfiguration) (new WorldGenFeatureCompositeConfiguration(this, worldgendecoratorconfigured))); ++ return worldgenerator.b(new WorldGenFeatureCompositeConfiguration(this, worldgendecoratorconfigured)); // Purpur - decompile error + } + + public WorldGenFeatureRandomChoiceConfigurationWeight a(float f) { +@@ -47,7 +47,7 @@ public class WorldGenFeatureConfigured(worldgenerator, dynamic.get("config").orElseEmptyMap()); + } catch (RuntimeException runtimeexception) { +- WorldGenFeatureConfigured.LOGGER.warn("Error while deserializing {}", s); ++ //WorldGenFeatureConfigured.LOGGER.warn("Error while deserializing {}", s); // Purpur + return new WorldGenFeatureConfigured<>(WorldGenerator.NO_OP, WorldGenFeatureEmptyConfiguration.e); + } + } +-- +2.24.0 +