9
0
mirror of https://github.com/Samsuik/Sakura.git synced 2025-12-21 15:59:26 +00:00

Begin backporting to 1.18.2

This commit is contained in:
Samsuik
2025-03-14 18:45:24 +00:00
parent 9e384db972
commit 9ec82c34ea
101 changed files with 1971 additions and 2021 deletions

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Customise Version Command
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index ac9b690fcccb60b587e5345f12f1383afd0a73a1..80d836d561f9de3f4dba660a065edfe1092582d8 100644
index a87399fa4838d4b2c1ff9cc35d433ae76cc149bf..8cfb453c44a4daf308ee562a7e5f7a577bb2dc6c 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -125,6 +125,20 @@ public final class Bukkit {
@@ -124,6 +124,20 @@ public final class Bukkit {
// Paper end
}
@@ -30,10 +30,10 @@ index ac9b690fcccb60b587e5345f12f1383afd0a73a1..80d836d561f9de3f4dba660a065edfe1
* 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 e40f017f87d6b6b4770501b106c76dc69ec69abb..2b0e110c1531bae49ee634f2c5904c0ce68e89d7 100644
index 57a21495843f3a144cd73473cdc8781d6129b7ca..cfbbe38a8e204aab921a3950ff878dde488128eb 100644
--- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java
+++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
@@ -25,6 +25,11 @@ import org.bukkit.plugin.Plugin;
@@ -26,6 +26,11 @@ import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.PluginDescriptionFile;
import org.bukkit.util.StringUtil;
import org.jetbrains.annotations.NotNull;
@@ -45,7 +45,7 @@ index e40f017f87d6b6b4770501b106c76dc69ec69abb..2b0e110c1531bae49ee634f2c5904c0c
public class VersionCommand extends BukkitCommand {
private VersionFetcher versionFetcher;
@@ -36,6 +41,15 @@ public class VersionCommand extends BukkitCommand {
@@ -37,6 +42,15 @@ public class VersionCommand extends BukkitCommand {
return versionFetcher;
}
@@ -61,7 +61,7 @@ index e40f017f87d6b6b4770501b106c76dc69ec69abb..2b0e110c1531bae49ee634f2c5904c0c
public VersionCommand(@NotNull String name) {
super(name);
@@ -47,12 +61,18 @@ public class VersionCommand extends BukkitCommand {
@@ -48,12 +62,18 @@ public class VersionCommand extends BukkitCommand {
@Override
public boolean execute(@NotNull CommandSender sender, @NotNull String currentAlias, @NotNull String[] args) {