Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-26 04:25:26 +01:00
Code Issues Projects Releases Wiki 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:
f7662d5c SPIGOT-4283: Allow setting recipe groups

CraftBukkit Changes:
bfb91314 SPIGOT-4283: Allow setting recipe groups
This commit is contained in:
Aikar 2018-08-17 06:49:39 -04:00
parent 98d4ba9dce
commit 3d1abdee73
No known key found for this signature in database
GPG Key ID: 401ADFC9891FAAFE
3 changed files with 7 additions and 7 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 4fc07207023b06376573d258a25b0fde0dae728e Mon Sep 17 00:00:00 2001 From e36166b2e930a432e24a30faef537f2a01000315 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 d9af7155..d7fa6d28 100644 index 398ac245..fc06c7b6 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
@@ -23,6 +23,7 @@ public class ShapedRecipe implements Recipe, Keyed { @@ -24,6 +24,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 d9af7155..d7fa6d28 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 ca5c09b8..f2dd46f2 100644 index 0c340c84..7d60a0a9 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
@@ -23,6 +23,7 @@ public class ShapelessRecipe implements Recipe, Keyed { @@ -25,6 +25,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
work/Bukkit

@ -1 +1 @@
Subproject commit 5d659aa0e44dfb8ec758f910f0a4d0d1dcddd614 Subproject commit f7662d5c9249b90936349d3da43bb0bab089e59e

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit 06112946da2e82ed8cbdd5f210f2a3373800181e Subproject commit bfb9131494176498e2444f7ac69bdc924192ee2e