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:
09b1c123 PR-916: Add more lightning API
c085f3de PR-859: Add Entity#getTrackedBy

CraftBukkit Changes:
1bf30a4e9 SPIGOT-7495: Spawning bee entity in asynchronous BlockPopulator causes IllegalStateException - Accessing LegacyRandomSource from multiple threads
476c5bccd PR-1267: Add more lightning API
40d5e6c02 PR-1190: Add Entity#getTrackedBy
40d41acc1 SPIGOT-7491: Downgrade bundled SQLite to be updated next release
44b31da38 PR-1264: Load Bukkit class before creating Registry item
dc45a6738 SPIGOT-7496: Failure to load datapacks with multiple identical predicates
f508657d6 Fix decompile error affecting javac
ef7a4743d PR-1265: Ensure UTF-8 used in new test resource

Spigot Changes:
224dad51 Rebuild patches

patches/api/More-lightning-API.patch

@@ -8,6 +8,26 @@ diff --git a/src/main/java/org/bukkit/entity/LightningStrike.java b/src/main/jav
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/entity/LightningStrike.java
 +++ b/src/main/java/org/bukkit/entity/LightningStrike.java
+@@ -0,0 +0,0 @@ public interface LightningStrike extends Entity {
+      * removed. By default this value is between 1 and 3.
+      *
+      * @return the flashes
++     * @deprecated use {@link #getFlashCount()}
+      */
++    @Deprecated // Paper
+     public int getFlashes();
+ 
+     /**
+@@ -0,0 +0,0 @@ public interface LightningStrike extends Entity {
+      * has reduced below 0.
+      *
+      * @param flashes the flashes
++     * @deprecated use {@link #setFlashCount(int)}
+      */
++    @Deprecated // Paper
+     public void setFlashes(int flashes);
+ 
+     /**
 @@ -0,0 +0,0 @@ public interface LightningStrike extends Entity {
      @Deprecated // Paper
      Spigot spigot();
@@ -31,22 +51,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    void setFlashCount(int flashes);
 +
 +    /**
-+     * Returns the amount of ticks the current flash will do damage for.
-+     * Starts with 2 by default, will damage while it is equal to or above 0, with the next flash beginning somewhere between 0 and -9.
-+     *
-+     * @return ticks the current flash will do damage for
-+     */
-+    int getLifeTicks();
-+
-+    /**
-+     * Sets the amount of ticks the current flash will do damage/fire for.
-+     * Default is 2 for each flash, on which the sound and effect will also be played.
-+     *
-+     * @param lifeTicks ticks the current flash will do damage for
-+     */
-+    void setLifeTicks(int lifeTicks);
-+
-+    /**
 +     * Returns the potential entity that caused this lightning strike to spawn in the world.
 +     * <p>
 +     * As of implementing this method, only {@link Player}s are capable of causing a lightning strike, however as this
@@ -65,19 +69,5 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     */
 +    @org.jetbrains.annotations.Nullable
 +    Entity getCausingEntity();
-+
-+    /**
-+     * Updates the player that caused this lightning to be summoned into the world.
-+     * By default, players that channel their {@link Trident} will be the cause of the respective lightning.
-+     * <p>
-+     * While the respective getter method {@link #getCausingEntity()} does not guarantee a player as the cause of a
-+     * lightning to stay as future proof as possible, as of implementing this method, players are the only entities
-+     * that can cause a lightning strike and hence this setter is restricted to players.
-+     * </p>
-+     *
-+     * @param causingPlayer the player that should be the new cause of this lightning. {@code null} may be passed to
-+     *                      indicate that no player is responsible for this lightning.
-+     */
-+    void setCausingPlayer(@org.jetbrains.annotations.Nullable Player causingPlayer);
 +    // Paper end
  }