Updated Upstream (Bukkit/CraftBukkit) (#8430)

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:
09943450 Update SnakeYAML version
5515734f SPIGOT-7162: Incorrect description for Entity#getVehicle javadoc
6f82b381 PR-788: Add getHand() to all relevant events

CraftBukkit Changes:
aaf484f6f SPIGOT-7163: CraftMerchantRecipe doesn't copy demand and specialPrice from BukkitMerchantRecipe
5329dd6fd PR-1107: Add getHand() to all relevant events
93061706e SPIGOT-7045: Ocelots never spawn with babies with spawn reason OCELOT_BABY

patches/server/0516-More-lightning-API.patch

@@ -0,0 +1,49 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Nassim Jahnke <nassim@njahnke.dev>
+Date: Sun, 26 Jul 2020 14:44:09 +0200
+Subject: [PATCH] More lightning API
+
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java
+index f7991ff14ef9cda0327b8621bf615b49cffd7ac5..e515e819774bfb31ec03f05a5502921e66f2b0e2 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLightningStrike.java
+@@ -45,4 +45,38 @@ public class CraftLightningStrike extends CraftEntity implements LightningStrike
+         return this.spigot;
+     }
+     // Spigot end
++
++    // Paper start
++    @Override
++    public int getFlashCount() {
++        return getHandle().flashes;
++    }
++
++    @Override
++    public void setFlashCount(int flashes) {
++        com.google.common.base.Preconditions.checkArgument(flashes >= 0, "Flashes has to be a positive number!");
++        getHandle().flashes = flashes;
++    }
++
++    @Override
++    public int getLifeTicks() {
++        return getHandle().life;
++    }
++
++    @Override
++    public void setLifeTicks(int lifeTicks) {
++        getHandle().life = lifeTicks;
++    }
++
++    @Override
++    public @org.jetbrains.annotations.Nullable org.bukkit.entity.Entity getCausingEntity() {
++        final var cause = this.getHandle().getCause();
++        return cause == null ? null : cause.getBukkitEntity();
++    }
++
++    @Override
++    public void setCausingPlayer(@org.jetbrains.annotations.Nullable org.bukkit.entity.Player causingPlayer) {
++        this.getHandle().setCause(causingPlayer == null ? null : ((CraftPlayer) causingPlayer).getHandle());
++    }
++    // Paper end
+ }