diff --git a/Spigot-Server-Patches/Configurable-fishing-time-ranges.patch b/Spigot-Server-Patches/Configurable-fishing-time-ranges.patch
index dd5b6eff3e..de446ce1a3 100644
--- a/Spigot-Server-Patches/Configurable-fishing-time-ranges.patch
+++ b/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) {
diff --git a/Spigot-Server-Patches/Increase-Light-Queue-Size.patch b/Spigot-Server-Patches/Increase-Light-Queue-Size.patch
index 18313fa0ac..089751b8b1 100644
--- a/Spigot-Server-Patches/Increase-Light-Queue-Size.patch
+++ b/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());
diff --git a/work/Bukkit b/work/Bukkit
index eda400d3d7..f4f2ef4c27 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit eda400d3d7f661c78c6128131d76f22f1dc113f5
+Subproject commit f4f2ef4c27345098e83113b10cfd9d0718f53885
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 3eb7236e44..bc6a175eff 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 3eb7236e443d84d0cb8acb68c9bc6b324e4fbf62
+Subproject commit bc6a175eff672c6c1ca469211dffd61f124fa6a3