diff --git a/paper-server/nms-patches/net/minecraft/world/entity/animal/EntityDolphin.patch b/paper-server/nms-patches/net/minecraft/world/entity/animal/EntityDolphin.patch
index 7d33d151e7..bbc5e2bc73 100644
--- a/paper-server/nms-patches/net/minecraft/world/entity/animal/EntityDolphin.patch
+++ b/paper-server/nms-patches/net/minecraft/world/entity/animal/EntityDolphin.patch
@@ -42,15 +42,6 @@
                  this.onItemPickup(entityitem);
                  this.setItemSlot(EnumItemSlot.MAINHAND, itemstack);
                  this.setGuaranteedDrop(EnumItemSlot.MAINHAND);
-@@ -389,7 +406,7 @@
- 
-         @Override
-         public boolean canUse() {
--            return this.dolphin.gotFish() && this.dolphin.getAirSupply() >= 100;
-+            return this.dolphin.gotFish() && this.dolphin.getAirSupply() >= 100 && this.dolphin.level().getWorld().canGenerateStructures(); // MC-151364, SPIGOT-5494: hangs if generate-structures=false
-         }
- 
-         @Override
 @@ -489,7 +506,7 @@
  
          @Override
diff --git a/paper-server/nms-patches/net/minecraft/world/item/ItemCrossbow.patch b/paper-server/nms-patches/net/minecraft/world/item/ItemCrossbow.patch
index 78f8b114c4..d1b86c9d2e 100644
--- a/paper-server/nms-patches/net/minecraft/world/item/ItemCrossbow.patch
+++ b/paper-server/nms-patches/net/minecraft/world/item/ItemCrossbow.patch
@@ -1,17 +1,6 @@
 --- a/net/minecraft/world/item/ItemCrossbow.java
 +++ b/net/minecraft/world/item/ItemCrossbow.java
-@@ -113,6 +113,10 @@
-             if (itemstack1.isEmpty() && flag) {
-                 itemstack1 = new ItemStack(Items.ARROW);
-                 itemstack2 = itemstack1.copy();
-+                // CraftBukkit start - SPIGOT-4870, MC-150847
-+            } else if (itemstack1.isEmpty()) {
-+                return false;
-+                // CraftBukkit end
-             }
- 
-             if (!loadProjectile(entityliving, itemstack, itemstack1, k > 0, flag)) {
-@@ -236,11 +240,27 @@
+@@ -236,11 +236,27 @@
  
                  ((IProjectile) object).shoot((double) vector3f.x(), (double) vector3f.y(), (double) vector3f.z(), f1, f2);
              }