Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@c95bc5f Don't unpack loot table for TEs not in world (#9918)
PaperMC/Paper@6675d13 Fix strikeLightningEffect powers lightning rods & clears copper (#9780)
PaperMC/Paper@63e77b5 Add Enchantment cost API (#9856)
PaperMC/Paper@d8847bc Updated Upstream (Bukkit/CraftBukkit) (#9922)
PaperMC/Paper@dd47ec6 Add Entity Movement Direction API (#7085)
PaperMC/Paper@9ee60ec Add aggressive mob API (#9838)
PaperMC/Paper@531ef27 Use ApiStatus.Internal instead of Deprecated (#9042)
PaperMC/Paper@9548629 Add hand to fish event for all player interactions (#9929)
PaperMC/Paper@aee3830 Deprecate Material#isInteractable (#9216)
PaperMC/Paper@a506b48 Fix several issues with EntityBreedEvent (#8677)
PaperMC/Paper@f186318 Run the chat callback on the main thread as expected (#9935)
This commit is contained in:
granny
2023-11-12 01:44:08 -08:00
parent ea2835bfe1
commit 1adf78b91a
41 changed files with 147 additions and 147 deletions

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Bring back server name
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index f78b5fd3c3347d28da58777bff88903d2eb140f6..7338dad470cd75814cce5be40f82058554484607 100644
index 884902cb7f86c0b56594ccafc7d05c6c7a23ab53..7e125817c68d5549be1eaa35c563e44e4c2c5239 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2756,4 +2756,15 @@ public final class Bukkit {
@@ -2832,4 +2832,15 @@ public final class Bukkit {
public static Server.Spigot spigot() {
return server.spigot();
}
@@ -25,10 +25,10 @@ index f78b5fd3c3347d28da58777bff88903d2eb140f6..7338dad470cd75814cce5be40f820585
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index c71576fea7e0e7c3ad54912ed61d1ff20aaea4c2..fc2ff6fce4d7b4466cb7936b530c1c0d17f9f24f 100644
index b599ed409f483379fae75938d27187b63b34225b..a7afd08014f0c571e01d26e809f2c1a6f6f5ce2d 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2416,4 +2416,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2485,4 +2485,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
boolean isOwnedByCurrentRegion(@NotNull Entity entity);
// Paper end - Folia region threading API