mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

[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:
f1e73b03 #525: Add contributors plugin.yml field.
ef0999fe #529: Added getRecipe() method to retrieve a Recipe by it's NamespacedKey

CraftBukkit Changes:
8b831a965 #714: Added getRecipe() method to retrieve a Recipe by it's NamespacedKey
This commit is contained in:
Aikar 2020-07-22 04:26:59 -04:00
parent 0901ffd046
commit 2712c68885
No known key found for this signature in database
GPG key ID: 401ADFC9891FAAFE
36 changed files with 112 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Spigot-API-Patches/0014-Expose-server-CommandMap.patch
View file

@ -5,10 +5,10 @@ Subject: [PATCH] Expose server CommandMap
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 15543603c168623572b1a26e41eb20058770784d..b46222ed2822fea563585462e43ee73ba2bb9b37 100644
index 59f0ba664dd945f24eaf9e38e98fdef0c4aaaa92..9433934d52e637ca340934350b43d4c827ee9606 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1575,6 +1575,19 @@ public final class Bukkit {
@@ -1586,6 +1586,19 @@ public final class Bukkit {
return server.getUnsafe();
}
@ -29,10 +29,10 @@ index 15543603c168623572b1a26e41eb20058770784d..b46222ed2822fea563585462e43ee73b
public static Server.Spigot spigot() {
return server.spigot();
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 3af00d77f9015f2eccab3047676b70c1af68daa7..d3c498ad0e7681422ef2117be41c6603ebce0e0a 100644
index 5cf43d538eee6eff031a93ab28f8f33c661acee3..620a16eaa74a31711b8598a70c9e9ed0f361ceb8 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1186,6 +1186,15 @@ public interface Server extends PluginMessageRecipient {
@@ -1195,6 +1195,15 @@ public interface Server extends PluginMessageRecipient {
public double[] getTPS();
// Paper end