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 appear 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:
a6aba46f PR-1078: Improve Javadocs of Player#loadData() and Player#saveData()
1e2e6a18 SPIGOT-7946: API for server pause when empty seconds
54a36938 SPIGOT-7944, PR-1077: Allow nullable fields in DamageTypeTags

CraftBukkit Changes:
2702c5c8e SPIGOT-7946: API for server pause when empty seconds
485f910fc SPIGOT-7947: addPassenger doesn't work if the vehicle is a player
ecf3dff0e SPIGOT-7949: Registering a new scoreboard objective with an empty display name throws a NPE
9b048cc84 SPIGOT-7948: `Bukkit#dispatchCommand` uses the wrong `CommandListenerWrapper` for Players
7b44d4640 SPIGOT-7931: Fix sync in Anvil View when result item is taken
This commit is contained in:
Nassim Jahnke 2024-11-09 17:01:35 +01:00
parent 00ef8bdcb0
commit 6483ecb8a2
No known key found for this signature in database
GPG key ID: EF6771C01F6EF02F
41 changed files with 146 additions and 149 deletions
Download patch file Download diff file Expand all files Collapse all files

8
patches/api/0180-Add-tick-times-API.patch
View file

@ -5,10 +5,10 @@ Subject: [PATCH] Add tick times API
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 594055b26e166e8e7aae0a98688b4ee5f93f5b2a..b84326b7831829cfa10c31073c6a2de56f86ccd6 100644
index 7e4673f672233d69df4bf53244542daa7fdcac75..57a9b5433ffb22017e24c9be4a2eeaa2f439bea8 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2194,6 +2194,25 @@ public final class Bukkit {
@@ -2218,6 +2218,25 @@ public final class Bukkit {
public static double[] getTPS() {
return server.getTPS();
}
@ -35,10 +35,10 @@ index 594055b26e166e8e7aae0a98688b4ee5f93f5b2a..b84326b7831829cfa10c31073c6a2de5
/**
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 6363a5b978679435fe9d618326ad54bdc43be895..b128ed4111c6c128c71095e757e57660f61f4f59 100644
index df37ce5da240ead6841e72ebdfddf2cd55caa27b..940f36835b541931ece973636c2e07e1a3c0db5b 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1859,6 +1859,21 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1877,6 +1877,21 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
@NotNull
public double[] getTPS();