Begin update to 1.20.5

This commit is contained in:
Jake Potrebic 2024-04-23 10:02:08 -07:00
parent f4c7d373e4
commit abc49bf069
No known key found for this signature in database
GPG key ID: ECE0B3C133C016C5
1409 changed files with 1134 additions and 1281 deletions

View file

@ -6,10 +6,10 @@ Subject: [PATCH] Expose MinecraftServer#isRunning
This allows for plugins to detect if the server is actually turning off in onDisable rather than just plugins reloading.
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 10aea8b80b49a6c47b04de4d3f33eb786f08651b..803ca460cf91f6760d7b16e1310a23d6b09725b3 100644
index 385be33869f3850f8b1d3e690c8e0fc43adcbdce..f24d57a89dc4fdf73298bbb4cc187794c7bd6706 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2498,6 +2498,15 @@ public final class Bukkit {
@@ -2521,6 +2521,15 @@ public final class Bukkit {
public static int getCurrentTick() {
return server.getCurrentTick();
}
@ -26,10 +26,10 @@ index 10aea8b80b49a6c47b04de4d3f33eb786f08651b..803ca460cf91f6760d7b16e1310a23d6
@NotNull
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 4b3fadfc90299cc717d85cb9856662e2b3230872..1575218ee7eb563b17b542b578c10d125889a7be 100644
index d6d83b22389aee98967adda2631fa65ecbf00781..015f1167bdc752fe6665807866caa0cda5ba0571 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2177,5 +2177,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2196,5 +2196,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
* @return Current tick
*/
int getCurrentTick();