Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
0fc6213f9c Allow skipping writing of comments to server.properties (#6251)
aec9781f52 Fix incorrect colors in ConsoleCommandSender messages with TranslatableComponents (#6287)
9a74e70cc0 fix: boats' bounding boxes must be deflated, not inflated (#6314)
6226208d64 Fix SysoutCatcher when plugins log before initialisation (Fixes #6323)
d239eca9dd Fix writing server.properties with wrong encoding (#6322)
f521a18a17 Updated Upstream (Bukkit/CraftBukkit)
This commit is contained in:
William Blake Galbreath
2021-08-06 01:07:04 -05:00
parent d3a45fc041
commit 956156df48
13 changed files with 25 additions and 44 deletions

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] ItemStack convenience methods
diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
index d635c4fb85d3eeea3853037b2da5881c4853b193..a51f4a3f77cfb946dc3b9fc8e367d6f08377a6de 100644
index 08eb0cc65308c5d4078814a0bccf84142737e87a..1f113c6befc2498b3770eb5dd61a69a9ea962bd6 100644
--- a/src/main/java/org/bukkit/Material.java
+++ b/src/main/java/org/bukkit/Material.java
@@ -9822,4 +9822,40 @@ public enum Material implements Keyed {
@@ -9819,4 +9819,40 @@ public enum Material implements Keyed {
// </editor-fold>
}
}