diff --git a/Spigot-Server-Patches/Ability-to-apply-mending-to-XP-API.patch b/Spigot-Server-Patches/Ability-to-apply-mending-to-XP-API.patch
index 0fb9c8ad4b..a8604aae19 100644
--- a/Spigot-Server-Patches/Ability-to-apply-mending-to-XP-API.patch
+++ b/Spigot-Server-Patches/Ability-to-apply-mending-to-XP-API.patch
@@ -10,7 +10,7 @@ of giving the player experience points.
 Both an API To standalone mend, and apply mending logic to .giveExp has been added.
 
 diff --git a/src/main/java/net/minecraft/server/EnchantmentManager.java b/src/main/java/net/minecraft/server/EnchantmentManager.java
-index 1822178e8..fabc7a8dd 100644
+index 1822178e8..d96c03a1a 100644
 --- a/src/main/java/net/minecraft/server/EnchantmentManager.java
 +++ b/src/main/java/net/minecraft/server/EnchantmentManager.java
 @@ -0,0 +0,0 @@ public class EnchantmentManager {
@@ -18,9 +18,9 @@ index 1822178e8..fabc7a8dd 100644
      }
  
 +    // Paper - OBFHELPER
-+    public static @Nullable ItemStack getRandomEquippedItemWithEnchant(Enchantment enchantment, EntityLiving entityliving) {
++    public static @javax.annotation.Nonnull ItemStack getRandomEquippedItemWithEnchant(Enchantment enchantment, EntityLiving entityliving) {
 +        Entry<EnumItemSlot, ItemStack> entry = b(enchantment, entityliving);
-+        return entry != null ? entry.getValue() : null;
++        return entry != null ? entry.getValue() : ItemStack.NULL_ITEM;
 +    }
      @Nullable
      public static Entry<EnumItemSlot, ItemStack> b(Enchantment enchantment, EntityLiving entityliving) {