Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@99b735c Make EntityLookup#get use read lock for entity maps
PaperMC/Paper@a2ba452 Update paperweight to 1.5.8 (#9814)
PaperMC/Paper@e87240b Fixes for loot tables (#9818)
PaperMC/Paper@72f7945 Fix painting loosing art on face change (#9798)
PaperMC/Paper@69ce927 Make setVelocity method of Fireballs change the travel direction to an arbitrary vector (#9815)
PaperMC/Paper@7e5dd92 fix flat bedrock world config (#9728)
PaperMC/Paper@5509610 Fix UnsafeValues#loadAdvancement (#9753)
PaperMC/Paper@1a4778d Fix PlayerSwapHandItemsEvent NPE when a hand set to null (#9763)
PaperMC/Paper@2f5bb7e add predicate recipe choice only for potion mixes (#9486)
This commit is contained in:
granny
2023-10-10 16:59:00 -07:00
parent 69d6fae064
commit f898434abc
5 changed files with 11 additions and 8 deletions

View File

@@ -5181,10 +5181,10 @@ index 06d1bdb9bd124b201c36d284c50d22bf50d3735a..937f57d8af629c4e913d7ccabf6adab1
public boolean isPickable() {
return false;
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 315d8260e196709ed9084272aa640f11e327c0a8..25883decef819df7758b8fdd7c4de48f0d0d05a1 100644
index f7ebddd35ff5a60a81034fd7de035ebba83e9517..6092004f91e1a4a143df1a82bcad9c16760f5096 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -1523,4 +1523,27 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -1527,4 +1527,27 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
return this.getHandle().getScoreboardName();
}
// Paper end - entity scoreboard name