diff --git a/Spigot-Server-Patches/0310-Add-sun-related-API.patch b/Spigot-Server-Patches/0310-Add-sun-related-API.patch
index 94d311975..62645fa0e 100644
--- a/Spigot-Server-Patches/0310-Add-sun-related-API.patch
+++ b/Spigot-Server-Patches/0310-Add-sun-related-API.patch
@@ -1,4 +1,4 @@
-From ad6bd5036e5ee80145156399673df57eb80ce635 Mon Sep 17 00:00:00 2001
+From 385c1916cb44cea61c817fedaed56efda2fc0064 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 7 Oct 2018 00:54:21 -0500
 Subject: [PATCH] Add sun related API
@@ -17,7 +17,7 @@ index eadac07f6..cbaed08f5 100644
          if (this.world.J() && !this.world.isClientSide) {
              float f = this.aI();
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 7a9159252..3e4632425 100644
+index 5e6a4e20b..08b6ae252 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -631,6 +631,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -26,7 +26,7 @@ index 7a9159252..3e4632425 100644
  
 +    public boolean isDayTime() { return J(); } // Paper - OBFHELPER
      public boolean J() {
-         return this.worldProvider.getDimensionManager() == DimensionManager.OVERWORLD && this.c < 4;
+         return this.worldProvider.getDimensionManager().getType() == DimensionManager.OVERWORLD && this.c < 4; // CraftBukkit
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 index 8a0675037..aec657952 100644
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 61d4b0902..e43416a34 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 61d4b0902319ca7fceb0a85a1d574ad47cc9239c
+Subproject commit e43416a342cbb52a9b524e504c4bb7edfe317db0