From d6e23b14a79b96718c7342eeb55636491f653f1f Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 3 Jul 2020 02:08:00 -0400
Subject: [PATCH] Updated Upstream (Bukkit/CraftBukkit/Spigot)

Upstream has released updates that appears 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:
0ca45a21 #503: Add PlayerHarvestBlockEvent
dfa80a52 SPIGOT-5930: Add PlayerRespawnEvent#isAnchorSpawn

CraftBukkit Changes:
145921e2 #676: Add PlayerHarvestBlockEvent
47abffa2 SPIGOT-5929: Angered zombified piglins do not inherit killed_by_player status
7f6b4f58 SPIGOT-5930: Add PlayerRespawnEvent#isAnchorSpawn
94eff632 SPIGOT-5867, MC-193339: NPE during shutdown when rcon enabled with no password
068618eb SPIGOT-5927: Some items NBT data disappears

Spigot Changes:
beb7d47c Rebuild patches

Fixes #3738
---
 .../Add-ArmorStand-Item-Meta.patch            | 23 ++++++++-----------
 work/Bukkit                                   |  2 +-
 work/CraftBukkit                              |  2 +-
 work/Spigot                                   |  2 +-
 4 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/Spigot-Server-Patches/Add-ArmorStand-Item-Meta.patch b/Spigot-Server-Patches/Add-ArmorStand-Item-Meta.patch
index c444ddd30..9240c0c23 100644
--- a/Spigot-Server-Patches/Add-ArmorStand-Item-Meta.patch
+++ b/Spigot-Server-Patches/Add-ArmorStand-Item-Meta.patch
@@ -40,23 +40,20 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      NBTTagCompound entityTag;
  
      CraftMetaArmorStand(CraftMetaItem meta) {
-         super(meta);
-+
+@@ -0,0 +0,0 @@ public class CraftMetaArmorStand extends CraftMetaItem {
+         }
+ 
+         CraftMetaArmorStand armorStand = (CraftMetaArmorStand) meta;
 +        // Paper start
-+        if (!(meta instanceof CraftMetaArmorStand)) {
-+            return;
-+        }
-+
-+        CraftMetaArmorStand standMeta = (CraftMetaArmorStand) meta;
-+        this.invisible = standMeta.invisible;
-+        this.noBasePlate = standMeta.noBasePlate;
-+        this.showArms = standMeta.showArms;
-+        this.small = standMeta.small;
-+        this.marker = standMeta.marker;
++        this.invisible = armorStand.invisible;
++        this.noBasePlate = armorStand.noBasePlate;
++        this.showArms = armorStand.showArms;
++        this.small = armorStand.small;
++        this.marker = armorStand.marker;
 +        // Paper end
+         this.entityTag = armorStand.entityTag;
      }
  
-     CraftMetaArmorStand(NBTTagCompound tag) {
 @@ -0,0 +0,0 @@ public class CraftMetaArmorStand extends CraftMetaItem {
  
          if (tag.hasKey(ENTITY_TAG.NBT)) {
diff --git a/work/Bukkit b/work/Bukkit
index 1cb03826e..0ca45a21b 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 1cb03826ebde4ef887519ce37b0a2a341494a183
+Subproject commit 0ca45a21b94ba986a410ad495ad40b0ee2aa6de4
diff --git a/work/CraftBukkit b/work/CraftBukkit
index dc7c3c61f..145921e2a 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit dc7c3c61fa061c87eca5d158f1f1c369620622b6
+Subproject commit 145921e2a6ca99081f6019321b63e80756f9cac9
diff --git a/work/Spigot b/work/Spigot
index 4d9262cf9..beb7d47c1 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit 4d9262cf9f7cf1a38525d21734708c3fe4a28bcb
+Subproject commit beb7d47c1d386faa934fceb3b8bd914721074b59