Updated Upstream (Bukkit/CraftBukkit)

Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
f4f2ef4c SPIGOT-6222: Correct javadoc for Entity#setPassenger
1871ca9d #559: Add wait time modification for FishHook

CraftBukkit Changes:
bc6a175e #767: Add wait time modification for FishHook
2fc37bcc SPIGOT-6197: Prevent world loading from updating spawn settings of all worlds

Spigot-Server-Patches/Configurable-fishing-time-ranges.patch

@@ -26,11 +26,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java
 +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
 @@ -0,0 +0,0 @@ public class EntityFishingHook extends IProjectile {
-                     this.ai = MathHelper.nextInt(this.random, 20, 80);
-                 }
-             } else {
--                this.ah = MathHelper.nextInt(this.random, 100, 600);
-+                this.ah = MathHelper.nextInt(this.random, world.paperConfig.fishingMinTicks, world.paperConfig.fishingMaxTicks); // Paper
-                 this.ah -= this.ao * 20 * 5;
-             }
-         }
+         entityhuman.hookedFish = this;
+         this.an = Math.max(0, i);
+         this.ao = Math.max(0, j);
++        // Paper start
++        minWaitTime = world.paperConfig.fishingMinTicks;
++        maxWaitTime = world.paperConfig.fishingMaxTicks;
++        // paper end
+     }
+ 
+     public EntityFishingHook(EntityHuman entityhuman, World world, int i, int j) {

Spigot-Server-Patches/Increase-Light-Queue-Size.patch

@@ -37,6 +37,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          worldloadlistener.b();
 -        chunkproviderserver.getLightEngine().a(5);
 +        chunkproviderserver.getLightEngine().a(worldserver.paperConfig.lightQueueSize); // Paper - increase light queue size
-         this.bc();
- 
          // CraftBukkit start
+         // this.bc();
+         worldserver.setSpawnFlags(this.getSpawnMonsters(), this.getSpawnAnimals());

work/Bukkit

@@ -1 +1 @@
-Subproject commit eda400d3d7f661c78c6128131d76f22f1dc113f5
+Subproject commit f4f2ef4c27345098e83113b10cfd9d0718f53885

work/CraftBukkit

@@ -1 +1 @@
-Subproject commit 3eb7236e443d84d0cb8acb68c9bc6b324e4fbf62
+Subproject commit bc6a175eff672c6c1ca469211dffd61f124fa6a3