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
This commit is contained in:
BillyGalbreath
2020-12-19 11:44:25 -06:00
parent e704540051
commit 26b0736149
2 changed files with 2 additions and 2 deletions

View File

@@ -29,7 +29,7 @@ index ac7f390cf0a404daeb80f89326fe1e510292f817..3b9b44851c5832a3660a73449b52478c
metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> {
Map<String, Map<String, Integer>> 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 {