Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@cab3010a Update a whole lot of deprecated annotations
PaperMC/Paper@6aad8807 compile fixes and equipOnInteract
PaperMC/Paper@c1f5409d Some progress
PaperMC/Paper@91a38cdb Finish more item data component API
PaperMC/Paper@d8afce2e Split thrown potion
PaperMC/Paper@46d21c11 cleanup events
PaperMC/Paper@46e7c750 fix legacy serialization with equipOnInteract and add preconditions
This commit is contained in:
granny
2025-03-23 12:40:33 -07:00
parent a76ef64526
commit f5091f2fab
11 changed files with 15 additions and 15 deletions

View File

@@ -1,6 +1,6 @@
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2996,4 +_,133 @@
@@ -2994,4 +_,133 @@
public static void restart() {
server.restart();
}

View File

@@ -1,6 +1,6 @@
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2705,4 +_,111 @@
@@ -2707,4 +_,111 @@
*/
void allowPausing(@NotNull org.bukkit.plugin.Plugin plugin, boolean value);
// Paper end - API to check if the server is sleeping

View File

@@ -1,6 +1,6 @@
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -4278,6 +_,86 @@
@@ -4277,6 +_,86 @@
@Nullable
public DragonBattle getEnderDragonBattle();

View File

@@ -13,7 +13,7 @@
* @return player spawned status
- * @deprecated this functionality no longer exists
*/
- @Deprecated(since = "1.17")
- @Deprecated(since = "1.17", forRemoval = true)
boolean isPlayerSpawned();
/**
@@ -26,7 +26,7 @@
* @param playerSpawned player spawned status
- * @deprecated this functionality no longer exists
*/
- @Deprecated(since = "1.17")
- @Deprecated(since = "1.17", forRemoval = true)
void setPlayerSpawned(boolean playerSpawned);
// Paper start
/**

View File

@@ -1,6 +1,6 @@
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -1192,4 +_,59 @@
@@ -1193,4 +_,59 @@
*/
void broadcastHurtAnimation(@NotNull java.util.Collection<Player> players);
// Paper end - broadcast hurt animation

View File

@@ -1,6 +1,6 @@
--- a/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java
+++ b/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java
@@ -306,7 +_,8 @@
@@ -310,7 +_,8 @@
WORLD_BORDER,
/**
* Damage caused when an entity contacts a block such as a Cactus,

View File

@@ -1,6 +1,6 @@
--- a/src/main/java/org/bukkit/event/entity/EntityPotionEffectEvent.java
+++ b/src/main/java/org/bukkit/event/entity/EntityPotionEffectEvent.java
@@ -216,6 +_,12 @@
@@ -218,6 +_,12 @@
* When all effects are removed due to a bucket of milk.
*/
MILK,

View File

@@ -1,6 +1,6 @@
--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
+++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
@@ -55,6 +_,7 @@
@@ -53,6 +_,7 @@
private final Pattern[] fileFilters = new Pattern[]{Pattern.compile("\\.jar$")};
private final List<PluginClassLoader> loaders = new CopyOnWriteArrayList<PluginClassLoader>();
private final LibraryLoader libraryLoader;