Updated Upstream (Gale)

Upstream has released updates that appear to apply and compile correctly

Gale Changes:
Dreeam-qwq/Gale@4033006 Updated Upstream (Paper)

gradle.properties

@@ -2,7 +2,7 @@ group = cn.dreeam.leaf
 mcVersion = 1.21.1
 version = 1.21.1-R0.1-SNAPSHOT
 
-galeCommit = 3a10fbfb0d13a2ef47da837b4c524272779f5c0d
+galeCommit = 40330062f3b1e46c65404f84011d3176abd33436
 
 org.gradle.caching = true
 org.gradle.parallel = true

patches/server/0011-Purpur-Server-Changes.patch

@@ -671,7 +671,7 @@ index 3b23d29e49678a9cd850f3dc91bbdc0c0ceb03e3..3e13ef5a4d3771a0c8eab0721951051a
              /* Drop global time updates
              if (this.tickCount % 20 == 0) {
 diff --git a/src/main/java/net/minecraft/server/PlayerAdvancements.java b/src/main/java/net/minecraft/server/PlayerAdvancements.java
-index 749dbb091af02c2e5922de14fc2743b7649f2928..ffea0dc3acc91b9d65ad0dc5482fee7115dec03a 100644
+index c4a5f744c089a7ef1ffbb3a19379fb510fb54af3..e01b1b1bb5818a06fde356c6e09b44356d5ae0de 100644
 --- a/src/main/java/net/minecraft/server/PlayerAdvancements.java
 +++ b/src/main/java/net/minecraft/server/PlayerAdvancements.java
 @@ -250,6 +250,7 @@ public class PlayerAdvancements {
@@ -13726,7 +13726,7 @@ index 321188173918d0d60858a258400dfd682ccdb21c..af47074f3a61a8518697d7851e43d543
 
                  return true;
 diff --git a/src/main/java/net/minecraft/world/item/CrossbowItem.java b/src/main/java/net/minecraft/world/item/CrossbowItem.java
-index c39fa953accd6cf35672f452052cca42fe6f29d0..dbdd1cd9486d91142e1c6b8a34aafba46c3988d3 100644
+index 1467e6f2df302e0b7992dcb6c136cb626ade3d2b..4e60c2102e3e838c68e4b9db41c8bca365d22923 100644
 --- a/src/main/java/net/minecraft/world/item/CrossbowItem.java
 +++ b/src/main/java/net/minecraft/world/item/CrossbowItem.java
 @@ -69,7 +69,7 @@ public class CrossbowItem extends ProjectileWeaponItem {
@@ -17389,7 +17389,7 @@ index 30d62ee4d5cd2ddacb8783b5bbbf475d592b3e02..5c1cda88080850314dac196dbe71ff12
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index a46fbd2a5e31dd9aa7fcf0867c91ec8d28990861..775d0082a94d262ef9b4196b7b23f66404db005f 100644
+index 4750df7354ccb5afd0910efe0415f3a2eb19a546..b21cd824587f7bed53255f7d0fc7bedefd45f9a4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -513,7 +513,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -17401,7 +17401,7 @@ index a46fbd2a5e31dd9aa7fcf0867c91ec8d28990861..775d0082a94d262ef9b4196b7b23f664
      }
      // Paper end
 
-@@ -1168,4 +1168,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -1192,4 +1192,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          return this.getHandle().canUseSlot(org.bukkit.craftbukkit.CraftEquipmentSlot.getNMS(slot));
      }
      // Paper end - Expose canUseSlot