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

12
Spigot-API-Patches/0008-Version-Command-2.0.patch
View file

@ -72,7 +72,7 @@ index 945b8b030d1b2a13afc0c4efad76997eb7bf00ba..1b6d737046646c102b0d519ab3f67c3f
// Paper end
}
diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
index cbce524442ca1ab0e2ade966f11b7dfa30a3f569..0486abd193f3b3b07bdda6b791b01badd40395dc 100644
index abbd1c35f9ac55ea61e94dd19d44c82628d1cb99..a47ed6b290c051ff076900028b929745aac0ba55 100644
--- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
@@ -1,5 +1,6 @@
@ -98,7 +98,7 @@ index cbce524442ca1ab0e2ade966f11b7dfa30a3f569..0486abd193f3b3b07bdda6b791b01bad
public VersionCommand(@NotNull String name) {
super(name);
@@ -150,18 +160,18 @@ public class VersionCommand extends BukkitCommand {
@@ -153,18 +163,18 @@ public class VersionCommand extends BukkitCommand {
private void sendVersion(@NotNull CommandSender sender) {
if (hasVersion) {
@ -120,7 +120,7 @@ index cbce524442ca1ab0e2ade966f11b7dfa30a3f569..0486abd193f3b3b07bdda6b791b01bad
return;
}
versionWaiters.add(sender);
@@ -183,7 +193,12 @@ public class VersionCommand extends BukkitCommand {
@@ -186,7 +196,12 @@ public class VersionCommand extends BukkitCommand {
private void obtainVersion() {
String version = Bukkit.getVersion();
@ -134,7 +134,7 @@ index cbce524442ca1ab0e2ade966f11b7dfa30a3f569..0486abd193f3b3b07bdda6b791b01bad
if (version.startsWith("git-Spigot-")) {
String[] parts = version.substring("git-Spigot-".length()).split("-");
int cbVersions = getDistance("craftbukkit", parts[1].substring(0, parts[1].indexOf(' ')));
@@ -213,6 +228,9 @@ public class VersionCommand extends BukkitCommand {
@@ -216,6 +231,9 @@ public class VersionCommand extends BukkitCommand {
} else {
setVersionMessage("Unknown version, custom build?");
}
@ -144,7 +144,7 @@ index cbce524442ca1ab0e2ade966f11b7dfa30a3f569..0486abd193f3b3b07bdda6b791b01bad
}
private void setVersionMessage(@NotNull String msg) {
@@ -222,8 +240,13 @@ public class VersionCommand extends BukkitCommand {
@@ -225,8 +243,13 @@ public class VersionCommand extends BukkitCommand {
try {
hasVersion = true;
versionTaskStarted = false;
@ -159,7 +159,7 @@ index cbce524442ca1ab0e2ade966f11b7dfa30a3f569..0486abd193f3b3b07bdda6b791b01bad
}
versionWaiters.clear();
} finally {
@@ -231,6 +254,15 @@ public class VersionCommand extends BukkitCommand {
@@ -234,6 +257,15 @@ public class VersionCommand extends BukkitCommand {
}
}