From 26b0736149043d2f66d487738daa4a28ae9cf9d7 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 19 Dec 2020 11:44:25 -0600 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appear to apply and compile correctly Paper Changes: 4e16d36e2 Fix typo in 0368-Asynchronous-chunk-IO-and-loading.patch 8e0ed41f3 Update Paperclip (again) 6817c0ebc Update Paperclip --- Paper | 2 +- patches/server/0003-Purpur-config-files.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Paper b/Paper index 9623b5f19..4e16d36e2 160000 --- a/Paper +++ b/Paper @@ -1 +1 @@ -Subproject commit 9623b5f19c0d5c1ec2ee1b05e1d3cd9de1f49a74 +Subproject commit 4e16d36e294edaf9a4e096411eb2123c1eeed856 diff --git a/patches/server/0003-Purpur-config-files.patch b/patches/server/0003-Purpur-config-files.patch index f9e2b7cb2..1ff303eb0 100644 --- a/patches/server/0003-Purpur-config-files.patch +++ b/patches/server/0003-Purpur-config-files.patch @@ -29,7 +29,7 @@ index ac7f390cf0a404daeb80f89326fe1e510292f817..3b9b44851c5832a3660a73449b52478c metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> { Map> map = new HashMap<>(); diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 26db8a5d92d494e5f6ba9498d5a1aa555642a92b..5e24ddc7dce6f6ed45267df3217177583bdd9eb0 100644 +index bc156a5edefe117ad45638d434fe4946fb50159d..041016de85360adacf4a5d0845bb1ebcc25a14b9 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -118,6 +118,11 @@ public class PaperConfig {