Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@a203544 build: Compile against and shade the filtered jar (#9747)
PaperMC/Paper@bd38e03 Updated Upstream (Bukkit/CraftBukkit) (#10379)
PaperMC/Paper@a774fba feat: Entity#teleportAsync method with TeleportFlags (#10371)
PaperMC/Paper@06361fa Fix invalid block entities created during world gen (#10375)
PaperMC/Paper@bbee11f Deprecate Bukkit#getLogger (#10388)
PaperMC/Paper@d8456ee Don't throw NPE for unplaced blockstate on #getDrops (#10366)
PaperMC/Paper@182e79b Add more item use API (#10304)
PaperMC/Paper@acf838f Backport some stuff from the generators branch (#10365)
PaperMC/Paper@3d31e45 Add BlockBreakProgressUpdateEvent (#10300)
PaperMC/Paper@8e75001 Disable vertical air friction when item entities have friction disabled (#10369)
PaperMC/Paper@241d8e2 Ignore minecart in activation range (#10359)
PaperMC/Paper@1207162 Allow player-list API to self un/list (#10358)
This commit is contained in:
granny
2024-04-06 19:03:06 -07:00
parent bd0d44dca7
commit b64f4f50e2
37 changed files with 153 additions and 175 deletions

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Ridables
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index 967125e99adc1b5446f42811d60ef44ba56ef5f5..02418d7d976147c70375002452cb39a4325de215 100644
index 23def071492ccd715693d534cc506936e18f0f46..93178130cba1aea4c210e47925703dca49ad4d97 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -1138,4 +1138,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -1144,4 +1144,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
*/
@NotNull String getScoreboardEntryName();
// Paper end - entity scoreboard name