Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@f6969b6 Updated Upstream (Bukkit/CraftBukkit/Spigot)
PaperMC/Paper@bb1c0dd Implement tracking range y setting
PaperMC/Paper@9d21a88 Fix tests
PaperMC/Paper@6573d95 update configurate (#9230)
PaperMC/Paper@f36bb59 Fix entity data not updated for firework attached to entity (#9783)
This commit is contained in:
granny
2023-10-04 00:16:25 -07:00
parent fa475bab82
commit 677566eb0a
8 changed files with 24 additions and 24 deletions

View File

@@ -22,10 +22,10 @@ index 0c4dbb9ef63fa8575b5546239443cb2bd91ba847..4160e968e7d7e8e2a953534a981a7330
* @deprecated removed in 1.20.2
*/
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index 762cb07861ca8ff058ce8d57ea6c15df1e588bf3..de60e8773e58ef62c15d8f7e293313a62dff674b 100644
index d340ddcf6924cc834455de3acbbac91ab9c66e39..656ea43ec614e5bf4d3474b9f02dafb970f33656 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -1049,4 +1049,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -1065,4 +1065,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
*/
@NotNull String getScoreboardEntryName();
// Paper end - entity scoreboard name