Repo-Mirror/SakuraMC
9
0
Fork 0
mirror of https://github.com/Samsuik/Sakura.git synced 2025-12-27 10:49:06 +00:00
Code Issues Releases Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@906df69 Prevent internal NPE on ItemStack#damage (#10836)
PaperMC/Paper@79e2cb6 Update upstream (Bukkit/CraftBukkit/Spigot) (#10875)
This commit is contained in:
Samsuik
2024-06-13 17:00:07 +01:00
parent f69c046d23
commit ac8701995c
10 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/api/0001-Customise-Version-Command.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Customise Version Command
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 9a219b255b63f10005fc68faacb771dd32f61ac2..63f8ca44f6066294cb1f996bfb89b0ce8b1e0afb 100644
index 47039514503d99e84cb99f4941707a7726286516..3e426dc442fd7c82cfd89c4c46290f0c857eddf9 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -124,6 +124,20 @@ public final class Bukkit {
@@ -30,10 +30,10 @@ index 9a219b255b63f10005fc68faacb771dd32f61ac2..63f8ca44f6066294cb1f996bfb89b0ce
* Gets the name of this server implementation.
*
diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
index fd5d9881abfd930bb883120f018f76dc78b62b14..5fdafa08fb8932333cacd1a6ddb701e96f89bec2 100644
index e64bb57f74e6d6f78927be228825b3e0bdf41f48..019b8abbf69ea0f741e725ae1c965f04604fe16d 100644
--- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
@@ -32,6 +32,11 @@ import net.kyori.adventure.text.event.ClickEvent;
@@ -33,6 +33,11 @@ import net.kyori.adventure.text.event.ClickEvent;
import net.kyori.adventure.text.format.TextDecoration;
import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
// Paper end - version command 2.0
@@ -45,7 +45,7 @@ index fd5d9881abfd930bb883120f018f76dc78b62b14..5fdafa08fb8932333cacd1a6ddb701e9
public class VersionCommand extends BukkitCommand {
private VersionFetcher versionFetcher; // Paper - version command 2.0
@@ -43,6 +48,15 @@ public class VersionCommand extends BukkitCommand {
@@ -44,6 +49,15 @@ public class VersionCommand extends BukkitCommand {
return versionFetcher;
}
@@ -61,7 +61,7 @@ index fd5d9881abfd930bb883120f018f76dc78b62b14..5fdafa08fb8932333cacd1a6ddb701e9
public VersionCommand(@NotNull String name) {
super(name);
@@ -54,12 +68,18 @@ public class VersionCommand extends BukkitCommand {
@@ -55,12 +69,18 @@ public class VersionCommand extends BukkitCommand {
@Override
public boolean execute(@NotNull CommandSender sender, @NotNull String currentAlias, @NotNull String[] args) {