diff --git a/Spigot-API-Patches/Add-sun-related-API.patch b/Spigot-API-Patches/Add-sun-related-API.patch
index 15a3611fa4..dc671f6cc7 100644
--- a/Spigot-API-Patches/Add-sun-related-API.patch
+++ b/Spigot-API-Patches/Add-sun-related-API.patch
@@ -23,7 +23,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    // Paper end
 +
      /**
-      * Returns whether the world has an ongoing storm.
+      * Gets the full in-game time on this world since the world generation
       *
 diff --git a/src/main/java/org/bukkit/entity/Mob.java b/src/main/java/org/bukkit/entity/Mob.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
diff --git a/Spigot-Server-Patches/Add-sun-related-API.patch b/Spigot-Server-Patches/Add-sun-related-API.patch
index 20fe3bb188..ec4f07fb6b 100644
--- a/Spigot-Server-Patches/Add-sun-related-API.patch
+++ b/Spigot-Server-Patches/Add-sun-related-API.patch
@@ -32,8 +32,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    // Paper end
 +
      @Override
-     public boolean createExplosion(double x, double y, double z, float power) {
-         return createExplosion(x, y, z, power, false, true);
+     public long getGameTime() {
+         return world.worldData.getTime();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
diff --git a/work/Bukkit b/work/Bukkit
index 315b69c1d1..5b289e6914 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 315b69c1d189f057263c5ac54c058352f706a8b9
+Subproject commit 5b289e69146fd76766ce7f973821b05792d9a695
diff --git a/work/CraftBukkit b/work/CraftBukkit
index a82b212973..d97d91871d 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit a82b21297372bff77085d76f1fda58e8b0e2e1ab
+Subproject commit d97d91871d7b2003591d9a9d59ee9c2306d3178a
diff --git a/work/Spigot b/work/Spigot
index cd23533a5b..73fb6094f4 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit cd23533a5b0ce59fcd0dd509be994b94d7c5f55e
+Subproject commit 73fb6094f4fa318955bb5bb11a1ec1af12cf90a1