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

1 files changed, 0 insertions, 58 deletions

diff --git a/patches/server/0694-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0694-Add-methods-to-find-targets-for-lightning-strikes.patch
deleted file mode 100644
index cf815001a9..0000000000
--- a/patches/server/0694-Add-methods-to-find-targets-for-lightning-strikes.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jakub Zacek <[email protected]>
-Date: Mon, 4 Oct 2021 10:16:44 +0200
-Subject: [PATCH] Add methods to find targets for lightning strikes
-
-
-diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 10abc211d4b5688de95066caccc7486acafd2858..a2a2042a9578af07d1f9399a97f13df5ea2ecf51 100644
---- a/src/main/java/net/minecraft/server/level/ServerLevel.java
-+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -813,6 +813,11 @@ public class ServerLevel extends Level implements WorldGenLevel {
-     }
- 
-     protected BlockPos findLightningTargetAround(BlockPos pos) {
-+        // Paper start
-+        return this.findLightningTargetAround(pos, false);
-+    }
-+    public BlockPos findLightningTargetAround(BlockPos pos, boolean returnNullWhenNoTarget) {
-+        // Paper end
-         BlockPos blockposition1 = this.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING, pos);
-         Optional<BlockPos> optional = this.findLightningRod(blockposition1);
- 
-@@ -827,6 +832,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
-             if (!list.isEmpty()) {
-                 return ((LivingEntity) list.get(this.random.nextInt(list.size()))).blockPosition();
-             } else {
-+                if (returnNullWhenNoTarget) return null; // Paper
-                 if (blockposition1.getY() == this.getMinBuildHeight() - 1) {
-                     blockposition1 = blockposition1.above(2);
-                 }
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index b6aefca1ef13ddbe4f79b91cfed4fbc109b89475..5a3e498776a35770a19535751f9dfcc1573035d7 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -686,6 +686,23 @@ public class CraftWorld extends CraftRegionAccessor implements World {
-         return (LightningStrike) lightning.getBukkitEntity();
-     }
- 
-+    // Paper start
-+    @Override
-+    public Location findLightningRod(Location location) {
-+        return this.world.findLightningRod(net.minecraft.server.MCUtil.toBlockPosition(location))
-+            .map(blockPos -> net.minecraft.server.MCUtil.toLocation(this.world, blockPos)
-+                // get the actual rod pos
-+                .subtract(0, 1, 0))
-+            .orElse(null);
-+    }
-+
-+    @Override
-+    public Location findLightningTarget(Location location) {
-+        final BlockPos pos = this.world.findLightningTargetAround(net.minecraft.server.MCUtil.toBlockPosition(location), true);
-+        return pos == null ? null : net.minecraft.server.MCUtil.toLocation(this.world, pos);
-+    }
-+    // Paper end
-+
-     @Override
-     public boolean generateTree(Location loc, TreeType type) {
-         return generateTree(loc, CraftWorld.rand, type);