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, 49 deletions

diff --git a/patches/server/0359-Add-option-to-nerf-pigmen-from-nether-portals.patch b/patches/server/0359-Add-option-to-nerf-pigmen-from-nether-portals.patch
deleted file mode 100644
index 7e248d9bd6..0000000000
--- a/patches/server/0359-Add-option-to-nerf-pigmen-from-nether-portals.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <[email protected]>
-Date: Fri, 7 Feb 2020 14:36:56 -0600
-Subject: [PATCH] Add option to nerf pigmen from nether portals
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 1b546c979d7ebe5f77fe7ad7fc422d94e8181aac..904015183bbaa3ac3976e3d81a7968ebb18c0c41 100644
---- a/src/main/java/net/minecraft/world/entity/Entity.java
-+++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -386,6 +386,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
-     // Paper start
-     public long activatedImmunityTick = Integer.MIN_VALUE; // Paper
-     public boolean isTemporarilyActive = false; // Paper
-+    public boolean fromNetherPortal; // Paper
-     protected int numCollisions = 0; // Paper
-     public boolean spawnedViaMobSpawner; // Paper - Yes this name is similar to above, upstream took the better one
-     @javax.annotation.Nullable
-@@ -2044,6 +2045,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
-             if (spawnedViaMobSpawner) {
-                 nbt.putBoolean("Paper.FromMobSpawner", true);
-             }
-+            if (fromNetherPortal) {
-+                nbt.putBoolean("Paper.FromNetherPortal", true);
-+            }
-             // Paper end
-             return nbt;
-         } catch (Throwable throwable) {
-@@ -2185,6 +2189,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
-             }
- 
-             spawnedViaMobSpawner = nbt.getBoolean("Paper.FromMobSpawner"); // Restore entity's from mob spawner status
-+            fromNetherPortal = nbt.getBoolean("Paper.FromNetherPortal");
-             if (nbt.contains("Paper.SpawnReason")) {
-                 String spawnReasonName = nbt.getString("Paper.SpawnReason");
-                 try {
-diff --git a/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java b/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java
-index 33078e2199c8eb0ce012a72eeb4421df12817b84..8c97cae63b4b373f1d67e797b9fe1064b5205da5 100644
---- a/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java
-+++ b/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java
-@@ -66,6 +66,8 @@ public class NetherPortalBlock extends Block {
- 
-                 if (entity != null) {
-                     entity.setPortalCooldown();
-+                    entity.fromNetherPortal = true; // Paper
-+                    if (world.paperConfig().entities.behavior.nerfPigmenFromNetherPortals) ((net.minecraft.world.entity.Mob) entity).aware = false; // Paper
-                 }
-             }
-         }