Repo-Mirror/OldSliceMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

[Auto] Updated Upstream (Bukkit/CraftBukkit)

Browse Source 
Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
1cb03826 SPIGOT-5900: Re-order Material enum entries to match Minecraft's order
fdd705db #507: Add hasDiscoveredRecipe() and getDiscoveredRecipes()

CraftBukkit Changes:
551e770f5 SPIGOT-5900: Add test for the order of Material enum entries
8297676c2 #682: Add hasDiscoveredRecipe() and getDiscoveredRecipes()
This commit is contained in:
Aikar
2020-07-01 19:41:58 -04:00
parent 75645fbfbf
commit 0823d3fdce
33 changed files with 74 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Spigot-Server-Patches/0131-String-based-Action-Bar-API.patch
View File

@@ -18,10 +18,10 @@ index 275c1d2d1eb2649de9a9b5aece6e88c21362efba..d72ba7f76c42fd525a5b59a999a0c08e
public static <K, V> Collector<Entry<? extends K, ? extends V>, ?, Map<K, V>> a() {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 1a7b9325108342cfbb781665ff1bf3ee3056bc9b..8776cfb8b5eda0b407af031747688e582c0c2bff 100644
index f8e141190c43bf9be1a7d782e8a22d74c5dedd95..bcf855b549e24929865ce4ca32ce15975b06f951 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -219,6 +219,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -221,6 +221,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
// Paper start