From 19da21cf2e621a3c5e2ee13e67101772f9ba5a2e Mon Sep 17 00:00:00 2001
From: granny <granny@purpurmc.org>
Date: Sat, 22 Jun 2024 01:17:04 -0700
Subject: [PATCH] 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
---
 gradle.properties                                           | 2 +-
 ...d-option-to-allow-loyalty-on-tridents-to-work-in-t.patch | 6 +++---
 patches/server/0165-API-for-any-mob-to-burn-daylight.patch  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 00d962486..b1b56be3a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
 version = 1.21-R0.1-SNAPSHOT
 
 mcVersion = 1.21
-paperCommit = 0a1b133c28bfa9b71cd23a10b42b521ad50aacb5
+paperCommit = 19105a9019d7e67fac176dd9b9709cd25c213d31
 
 org.gradle.caching = true
 org.gradle.parallel = true
diff --git a/patches/server/0044-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch b/patches/server/0044-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch
index c0dd26f6b..f1af72d33 100644
--- a/patches/server/0044-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch
+++ b/patches/server/0044-Add-option-to-allow-loyalty-on-tridents-to-work-in-t.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add option to allow loyalty on tridents to work in the void
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/ThrownTrident.java b/src/main/java/net/minecraft/world/entity/projectile/ThrownTrident.java
-index cb71f468e90f076caf2c0dcc5f2ba2745c737c22..c8dbca9573060f7d9c2a0a96a532f06d3c17728f 100644
+index 44c733c5b2c3e9942f28e882ad72306a24459c2c..bebaa347ddcc9f54f888fa1bc20a77c6a64c90e3 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/ThrownTrident.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/ThrownTrident.java
-@@ -68,7 +68,7 @@ public class ThrownTrident extends AbstractArrow {
+@@ -69,7 +69,7 @@ public class ThrownTrident extends AbstractArrow {
          Entity entity = this.getOwner();
          byte b0 = (Byte) this.entityData.get(ThrownTrident.ID_LOYALTY);
  
@@ -18,7 +18,7 @@ index cb71f468e90f076caf2c0dcc5f2ba2745c737c22..c8dbca9573060f7d9c2a0a96a532f06d
                  if (!this.level().isClientSide && this.pickup == AbstractArrow.Pickup.ALLOWED) {
                      this.spawnAtLocation(this.getPickupItem(), 0.1F);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index a85591019e39b4c179b7abe9b3bda864bdbe54bc..26598c983cef2e08d1836c77129ccf02990790d4 100644
+index 3273ac8bb8f836ea9d2d5d304985ca8152eb2d4a..9e97ab198ad30002f0513d766a1286dadb738e23 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -98,9 +98,11 @@ public class PurpurWorldConfig {
diff --git a/patches/server/0165-API-for-any-mob-to-burn-daylight.patch b/patches/server/0165-API-for-any-mob-to-burn-daylight.patch
index 538df4185..e505dfcd9 100644
--- a/patches/server/0165-API-for-any-mob-to-burn-daylight.patch
+++ b/patches/server/0165-API-for-any-mob-to-burn-daylight.patch
@@ -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