Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@a0fad76 Fix base damage for trident (#10948)
PaperMC/Paper@d64be7e Fix NPE of AbstractArrow#getWeapon (#10933)
PaperMC/Paper@081146c Validate using_converts_to for food component (#10931)
PaperMC/Paper@0409a68 deprecate and update some entity tags (#10932)
PaperMC/Paper@9cd0201 Preserve velocity for fireball (#10934)
PaperMC/Paper@19105a9 Fix unload queue storing chunks in wrong sections
This commit is contained in:
granny
2024-06-22 01:17:04 -07:00
parent 2ba7beeab5
commit 19da21cf2e
3 changed files with 6 additions and 6 deletions

View File

@@ -375,10 +375,10 @@ index 4be205b10229b238039e4221df043e47cba68511..d4fc45d4f419309ba11830accdc3cdaf
Preconditions.checkArgument(entity != null, "Unknown entity");
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index a1e715629313346f670bce92483996122b0f1d7b..26eaf4d9b931bfe51482e1f5d2350fc591778acc 100644
index b3970222ed979dda5296ce472739c112b70d0e89..e987086d234c62fc79e9f45d2d8ac8cd7c2dbd7b 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -1181,4 +1181,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -1182,4 +1182,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
this.getHandle().setYBodyRot(bodyYaw);
}
// Paper end - body yaw API