From c51e3e6e51a8cef69730cf3699a4f15d49d51ed9 Mon Sep 17 00:00:00 2001
From: Automated <noreply+automated@papermc.io>
Date: Fri, 12 Feb 2021 18:42:12 -0500
Subject: [PATCH] [Auto] Updated Upstream (Bukkit/CraftBukkit/Spigot)

Upstream has released updates that appear 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:
5b289e69 SPIGOT-5778: Added World.getGameTime method

CraftBukkit Changes:
d97d91871 SPIGOT-6347: Nether Portals Default to Nether, even in Nether
8aa6a953f SPIGOT-5778: Added World.getGameTime method

Spigot Changes:
73fb6094 #107: Add async catching to chunk entity add/remove
---
 Spigot-API-Patches/Add-sun-related-API.patch    | 2 +-
 Spigot-Server-Patches/Add-sun-related-API.patch | 4 ++--
 work/Bukkit                                     | 2 +-
 work/CraftBukkit                                | 2 +-
 work/Spigot                                     | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Spigot-API-Patches/Add-sun-related-API.patch b/Spigot-API-Patches/Add-sun-related-API.patch
index 15a3611fa4e..dc671f6cc75 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 20fe3bb188a..ec4f07fb6ba 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 315b69c1d18..5b289e69146 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 315b69c1d189f057263c5ac54c058352f706a8b9
+Subproject commit 5b289e69146fd76766ce7f973821b05792d9a695
diff --git a/work/CraftBukkit b/work/CraftBukkit
index a82b2129737..d97d91871d7 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit a82b21297372bff77085d76f1fda58e8b0e2e1ab
+Subproject commit d97d91871d7b2003591d9a9d59ee9c2306d3178a
diff --git a/work/Spigot b/work/Spigot
index cd23533a5b0..73fb6094f4f 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit cd23533a5b0ce59fcd0dd509be994b94d7c5f55e
+Subproject commit 73fb6094f4fa318955bb5bb11a1ec1af12cf90a1