Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
108efeee Fix zero reputation deleting villagers (#3857)
7db30ebd Use consistent priorities for light tasks
1de3f830 Support hex colors in getLastColors (#3922)
018d8602 Fix SPIGOT-5989 (#3920)
45909954 Fix moveToWorld worldserver reference (#3929)
9c16c413 [Auto] Updated Upstream (CraftBukkit)
45ffc2bf Move range check for block placing up (#3917)
This commit is contained in:
William Blake Galbreath
2020-07-17 14:56:51 -05:00
parent 2c821a73ec
commit ee5fe2fbdc
8 changed files with 24 additions and 24 deletions

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] ChatColor conveniences
diff --git a/src/main/java/org/bukkit/ChatColor.java b/src/main/java/org/bukkit/ChatColor.java
index 44d597d7..5a7b6a01 100644
index 4594701d..499b222d 100644
--- a/src/main/java/org/bukkit/ChatColor.java
+++ b/src/main/java/org/bukkit/ChatColor.java
@@ -403,4 +403,30 @@ public enum ChatColor {
@@ -413,4 +413,30 @@ public enum ChatColor {
BY_CHAR.put(color.code, color);
}
}