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

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:
8b6dd103 Update /version to reflect final build status.
6bdfd385 Remove some draft API designations
78a12dd9 SPIGOT-5417: Campfire should implement Directional

CraftBukkit Changes:
65670174 SPIGOT-5417: Campfire should implement Directional
eeae942e SPIGOT-5416: Block.getDrops gives drops even when tool should not give drops
This commit is contained in:
Shane Freeder 2019-12-10 23:23:50 +00:00
parent 86daffa21c
commit bb8b1e3eca
No known key found for this signature in database
GPG key ID: A3F61EA5A085289C
10 changed files with 46 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
From 6124a93a7105107c53e80a258380ffd286354c31 Mon Sep 17 00:00:00 2001
From ee371574e60d48deec48728d90765e89fbc2532a Mon Sep 17 00:00:00 2001
From: Zach Brown <zach@zachbr.io>
Date: Mon, 27 May 2019 01:10:06 -0500
Subject: [PATCH] Version Command 2.0
@ -6,7 +6,7 @@ Subject: [PATCH] Version Command 2.0
diff --git a/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java b/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java
new file mode 100644
index 000000000..2a2651299
index 00000000..2a265129
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java
@@ -0,0 +1,44 @@
@ -55,7 +55,7 @@ index 000000000..2a2651299
+ }
+}
diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
index 72c5501e8..c0ff133de 100644
index 72c5501e..c0ff133d 100644
--- a/src/main/java/org/bukkit/UnsafeValues.java
+++ b/src/main/java/org/bukkit/UnsafeValues.java
@@ -76,5 +76,12 @@ public interface UnsafeValues {
@ -72,7 +72,7 @@ index 72c5501e8..c0ff133de 100644
// 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 cbce52444..0486abd19 100644
index 9d8360f7..9a3bb0e9 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 cbce52444..0486abd19 100644
public VersionCommand(@NotNull String name) {
super(name);
@@ -150,18 +160,18 @@ public class VersionCommand extends BukkitCommand {
@@ -151,18 +161,18 @@ public class VersionCommand extends BukkitCommand {
private void sendVersion(@NotNull CommandSender sender) {
if (hasVersion) {
@ -120,7 +120,7 @@ index cbce52444..0486abd19 100644
return;
}
versionWaiters.add(sender);
@@ -183,7 +193,12 @@ public class VersionCommand extends BukkitCommand {
@@ -184,7 +194,12 @@ public class VersionCommand extends BukkitCommand {
private void obtainVersion() {
String version = Bukkit.getVersion();
@ -134,7 +134,7 @@ index cbce52444..0486abd19 100644
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 {
@@ -214,6 +229,9 @@ public class VersionCommand extends BukkitCommand {
} else {
setVersionMessage("Unknown version, custom build?");
}
@ -144,7 +144,7 @@ index cbce52444..0486abd19 100644
}
private void setVersionMessage(@NotNull String msg) {
@@ -222,8 +240,13 @@ public class VersionCommand extends BukkitCommand {
@@ -223,8 +241,13 @@ public class VersionCommand extends BukkitCommand {
try {
hasVersion = true;
versionTaskStarted = false;
@ -159,7 +159,7 @@ index cbce52444..0486abd19 100644
}
versionWaiters.clear();
} finally {
@@ -231,6 +254,15 @@ public class VersionCommand extends BukkitCommand {
@@ -232,6 +255,15 @@ public class VersionCommand extends BukkitCommand {
}
}
@ -176,5 +176,5 @@ index cbce52444..0486abd19 100644
try {
BufferedReader reader = Resources.asCharSource(
--
2.21.0
2.24.0