OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-29 07:48:53 +01:00
Code Issues Projects Releases Packages Wiki Activity

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:
eaf05a2a Expand Recipe API to allow multiple Materials per slot

CraftBukkit Changes:
4c219e2a Expand Recipe API to allow multiple Materials per slot
This commit is contained in:
Aikar 2018-08-31 23:53:49 -04:00
parent d089acb3bd
commit 62153085aa
No known key found for this signature in database
GPG key ID: 401ADFC9891FAAFE
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Spigot-API-Patches/0073-Display-warning-on-deprecated-recipe-API.patch
View file

@ -1,4 +1,4 @@
From e36166b2e930a432e24a30faef537f2a01000315 Mon Sep 17 00:00:00 2001 From 1d72b4d218c0c70b0a95059d93c1ae6d5de73fb6 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Sat, 9 Dec 2017 12:40:25 -0500 Date: Sat, 9 Dec 2017 12:40:25 -0500
Subject: [PATCH] Display warning on deprecated recipe API Subject: [PATCH] Display warning on deprecated recipe API
@ -10,10 +10,10 @@ on the players login.
Plugin authors need to define a key to keep it consistent between server restarts. Plugin authors need to define a key to keep it consistent between server restarts.
diff --git a/src/main/java/org/bukkit/inventory/ShapedRecipe.java b/src/main/java/org/bukkit/inventory/ShapedRecipe.java diff --git a/src/main/java/org/bukkit/inventory/ShapedRecipe.java b/src/main/java/org/bukkit/inventory/ShapedRecipe.java
index 398ac245..fc06c7b6 100644 index 90d6d50cd..80af6cf52 100644
--- a/src/main/java/org/bukkit/inventory/ShapedRecipe.java --- a/src/main/java/org/bukkit/inventory/ShapedRecipe.java
+++ b/src/main/java/org/bukkit/inventory/ShapedRecipe.java +++ b/src/main/java/org/bukkit/inventory/ShapedRecipe.java
@@ -24,6 +24,7 @@ public class ShapedRecipe implements Recipe, Keyed { @@ -25,6 +25,7 @@ public class ShapedRecipe implements Recipe, Keyed {
@Deprecated @Deprecated
public ShapedRecipe(ItemStack result) { public ShapedRecipe(ItemStack result) {
this.key = NamespacedKey.randomKey(); this.key = NamespacedKey.randomKey();
@ -22,10 +22,10 @@ index 398ac245..fc06c7b6 100644
} }
diff --git a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java diff --git a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
index 0c340c84..7d60a0a9 100644 index ea359c540..7347e7464 100644
--- a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java --- a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
+++ b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java +++ b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
@@ -25,6 +25,7 @@ public class ShapelessRecipe implements Recipe, Keyed { @@ -26,6 +26,7 @@ public class ShapelessRecipe implements Recipe, Keyed {
@Deprecated @Deprecated
public ShapelessRecipe(ItemStack result) { public ShapelessRecipe(ItemStack result) {
this.key = NamespacedKey.randomKey(); this.key = NamespacedKey.randomKey();

2
paper
View file

@ -82,7 +82,7 @@ case "$1" in
scripts/upstreamMerge.sh "$basedir" "$2" scripts/upstreamMerge.sh "$basedir" "$2"
) )
;; ;;
"cu" | "commitup" | "commitupstream" | "upcommit" | "upstreamcommit") "cu" | "commitup" | "commitupstream" | "upc" | "upcommit" | "upstreamcommit")
( (
cd "$basedir" cd "$basedir"
shift shift

2
work/Bukkit

@ -1 +1 @@
Subproject commit 28237f03e476ca980c59a5146954649d489fe5bc Subproject commit eaf05a2ab257f19498826db6964039d9b1246afd

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit 6304ccd95fc9498960e99f96b59479dfc08b3c8d Subproject commit 4c219e2a1206225cff4b34669c00106b1c312991