diff --git a/paper-server/nms-patches/EntityArrow.patch b/paper-server/nms-patches/EntityArrow.patch
index b2e47f37fc..ef27ceafb1 100644
--- a/paper-server/nms-patches/EntityArrow.patch
+++ b/paper-server/nms-patches/EntityArrow.patch
@@ -45,14 +45,14 @@
      }
  
      @Nullable
-@@ -453,9 +468,22 @@
+@@ -453,9 +468,23 @@
  
      public void d(EntityHuman entityhuman) {
          if (!this.world.isClientSide && (this.inGround || this.q()) && this.shake <= 0) {
 +            // CraftBukkit start
 +            ItemStack itemstack = this.getItemStack();
-+            EntityItem item = new EntityItem(this.world, this.locX, this.locY, this.locZ, itemstack);
-+            if (this.fromPlayer == PickupStatus.ALLOWED && entityhuman.inventory.canHold(itemstack) > 0) {
++            if (this.fromPlayer == PickupStatus.ALLOWED && !itemstack.isEmpty() && entityhuman.inventory.canHold(itemstack) > 0) {
++                EntityItem item = new EntityItem(this.world, this.locX, this.locY, this.locZ, itemstack);
 +                PlayerPickupArrowEvent event = new PlayerPickupArrowEvent((org.bukkit.entity.Player) entityhuman.getBukkitEntity(), new org.bukkit.craftbukkit.entity.CraftItem(this.world.getServer(), this, item), (org.bukkit.entity.Arrow) this.getBukkitEntity());
 +                // event.setCancelled(!entityhuman.canPickUpLoot); TODO
 +                this.world.getServer().getPluginManager().callEvent(event);
@@ -60,16 +60,17 @@
 +                if (event.isCancelled()) {
 +                    return;
 +                }
++                itemstack = item.getItemStack();
 +            }
              boolean flag = this.fromPlayer == EntityArrow.PickupStatus.ALLOWED || this.fromPlayer == EntityArrow.PickupStatus.CREATIVE_ONLY && entityhuman.abilities.canInstantlyBuild || this.q() && this.getShooter().getUniqueID() == entityhuman.getUniqueID();
  
 -            if (this.fromPlayer == EntityArrow.PickupStatus.ALLOWED && !entityhuman.inventory.pickup(this.getItemStack())) {
-+            if (this.fromPlayer == EntityArrow.PickupStatus.ALLOWED && !entityhuman.inventory.pickup(item.getItemStack())) {
++            if (this.fromPlayer == EntityArrow.PickupStatus.ALLOWED && !entityhuman.inventory.pickup(itemstack)) {
 +                // CraftBukkit end
                  flag = false;
              }
  
-@@ -528,7 +556,14 @@
+@@ -528,7 +557,14 @@
          }
  
          if (EnchantmentManager.a(Enchantments.ARROW_FIRE, entityliving) > 0) {
diff --git a/paper-server/nms-patches/EntityThrownTrident.patch b/paper-server/nms-patches/EntityThrownTrident.patch
index 8e2d44150b..c96db4477b 100644
--- a/paper-server/nms-patches/EntityThrownTrident.patch
+++ b/paper-server/nms-patches/EntityThrownTrident.patch
@@ -1,5 +1,14 @@
 --- a/net/minecraft/server/EntityThrownTrident.java
 +++ b/net/minecraft/server/EntityThrownTrident.java
+@@ -5,7 +5,7 @@
+ public class EntityThrownTrident extends EntityArrow {
+ 
+     private static final DataWatcherObject<Byte> h = DataWatcher.a(EntityThrownTrident.class, DataWatcherRegistry.a);
+-    private ItemStack aw;
++    public ItemStack aw; // PAIL
+     private boolean ax;
+     public int g;
+ 
 @@ -122,7 +122,7 @@
                  EntityLightning entitylightning = new EntityLightning(this.world, (double) blockposition.getX() + 0.5D, (double) blockposition.getY(), (double) blockposition.getZ() + 0.5D, false);
  
diff --git a/paper-server/nms-patches/ItemTrident.patch b/paper-server/nms-patches/ItemTrident.patch
index 868e9c5bdc..5a6f1c022d 100644
--- a/paper-server/nms-patches/ItemTrident.patch
+++ b/paper-server/nms-patches/ItemTrident.patch
@@ -23,7 +23,7 @@
                          if (k == 0) {
                              EntityThrownTrident entitythrowntrident = new EntityThrownTrident(world, entityhuman, itemstack);
  
-@@ -42,7 +46,17 @@
+@@ -42,7 +46,18 @@
                                  entitythrowntrident.fromPlayer = EntityArrow.PickupStatus.CREATIVE_ONLY;
                              }
  
@@ -37,12 +37,13 @@
 +                            }
 +
 +                            itemstack.damage(1, entityhuman);
++                            entitythrowntrident.aw = itemstack.cloneItemStack(); // SPIGOT-4511 update since damage call moved
 +                            // CraftBukkit end
 +
                              if (!entityhuman.abilities.canInstantlyBuild) {
                                  entityhuman.inventory.f(itemstack);
                              }
-@@ -53,6 +67,10 @@
+@@ -53,6 +68,10 @@
                      SoundEffect soundeffect = SoundEffects.ITEM_TRIDENT_THROW;
  
                      if (k > 0) {