diff --git a/patches/server/Fix-shield-disable-inconsistency.patch b/patches/server/Fix-shield-disable-inconsistency.patch
new file mode 100644
index 0000000000..74b8a04fa7
--- /dev/null
+++ b/patches/server/Fix-shield-disable-inconsistency.patch
@@ -0,0 +1,22 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <jake.m.potrebic@gmail.com>
+Date: Fri, 26 Apr 2024 19:08:37 -0700
+Subject: [PATCH] Fix shield disable inconsistency
+
+In vanilla, if the damage source is tagged as a projectile,
+it will not disable the shield if the attacker is holding
+an axe item.
+
+diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
++++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
+@@ -0,0 +0,0 @@ public abstract class LivingEntity extends Entity implements Attackable {
+                 this.hurtCurrentlyUsedShield((float) -event.getDamage(DamageModifier.BLOCKING));
+                 Entity entity = damagesource.getDirectEntity();
+ 
+-                if (entity instanceof LivingEntity && entity.distanceToSqr(this) <= (200.0D * 200.0D)) { // Paper - Improve boat collision performance
++                if (!damagesource.is(DamageTypeTags.IS_PROJECTILE) && entity instanceof LivingEntity && entity.distanceToSqr(this) <= (200.0D * 200.0D)) { // Paper - Improve boat collision performance
+                     this.blockUsingShield((LivingEntity) entity);
+                 }
+             }
diff --git a/patches/server/Remove-unnecessary-itemmeta-handling.patch b/patches/server/Remove-unnecessary-itemmeta-handling.patch
index 27a43a27ea..967a140516 100644
--- a/patches/server/Remove-unnecessary-itemmeta-handling.patch
+++ b/patches/server/Remove-unnecessary-itemmeta-handling.patch
@@ -18,10 +18,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                  }
                  return itemstack;
 @@ -0,0 +0,0 @@ public final class ItemStack implements DataComponentHolder {
+             } else {
                  registryfriendlybytebuf.writeVarInt(itemstack.getCount());
                  // Spigot start - filter
-                 itemstack = itemstack.copy();
+-                itemstack = itemstack.copy();
 -                CraftItemStack.setItemMeta(itemstack, CraftItemStack.getItemMeta(itemstack));
++                // itemstack = itemstack.copy();
 +                // CraftItemStack.setItemMeta(itemstack, CraftItemStack.getItemMeta(itemstack)); // Paper - This is no longer with raw NBT being handled in metadata
                  // Spigot end
                  ITEM_STREAM_CODEC.encode(registryfriendlybytebuf, itemstack.getItemHolder()); // CraftBukkit - decompile error