From 174c81a9634ad12f93f3fe4c5d4f4286ed9ccca0 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 1 Jul 2020 02:11:46 -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:
6ff65c82 SPIGOT-5908: CompassMeta for new lodestone compass data

CraftBukkit Changes:
3b9cf0f8 Improve code formatting
008f039f SPIGOT-5913: MOTD no longer supports new line character
b8b65eb7 SPIGOT-5908: CompassMeta for new lodestone compass data

Spigot Changes:
4d9262cf Rebuild patches
d27f7952 SPIGOT-5912: Outdated client message shows outdated server message
---
 .../Add-ArmorStand-Item-Meta.patch                 | 14 ++++++--------
 ...n-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch | 10 ++++------
 work/Bukkit                                        |  2 +-
 work/CraftBukkit                                   |  2 +-
 work/Spigot                                        |  2 +-
 5 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/Spigot-Server-Patches/Add-ArmorStand-Item-Meta.patch b/Spigot-Server-Patches/Add-ArmorStand-Item-Meta.patch
index b34f121bd9..c444ddd30a 100644
--- a/Spigot-Server-Patches/Add-ArmorStand-Item-Meta.patch
+++ b/Spigot-Server-Patches/Add-ArmorStand-Item-Meta.patch
@@ -41,7 +41,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  
      CraftMetaArmorStand(CraftMetaItem meta) {
          super(meta);
-+        
++
 +        // Paper start
 +        if (!(meta instanceof CraftMetaArmorStand)) {
 +            return;
@@ -271,22 +271,20 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -0,0 +0,0 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
-                         CraftMetaTropicalFishBucket.VARIANT.NBT,
                          CraftMetaCrossbow.CHARGED.NBT,
                          CraftMetaCrossbow.CHARGED_PROJECTILES.NBT,
--                        CraftMetaSuspiciousStew.EFFECTS.NBT
-+                        CraftMetaSuspiciousStew.EFFECTS.NBT,
+                         CraftMetaSuspiciousStew.EFFECTS.NBT,
 +                        // Paper start
 +                        CraftMetaArmorStand.ENTITY_TAG.NBT,
 +                        CraftMetaArmorStand.INVISIBLE.NBT,
 +                        CraftMetaArmorStand.NO_BASE_PLATE.NBT,
 +                        CraftMetaArmorStand.SHOW_ARMS.NBT,
 +                        CraftMetaArmorStand.SMALL.NBT,
-+                        CraftMetaArmorStand.MARKER.NBT
++                        CraftMetaArmorStand.MARKER.NBT,
 +                        // Paper end
-                 ));
-             }
-             return HANDLED_TAGS;
+                         CraftMetaCompass.LODESTONE_DIMENSION.NBT,
+                         CraftMetaCompass.LODESTONE_POS.NBT,
+                         CraftMetaCompass.LODESTONE_TRACKED.NBT
 diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
diff --git a/Spigot-Server-Patches/Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch b/Spigot-Server-Patches/Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
index e61cf95fb6..d465dc18ea 100644
--- a/Spigot-Server-Patches/Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
+++ b/Spigot-Server-Patches/Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch
@@ -273,16 +273,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          serializeInternal(internalTags);
          if (!internalTags.isEmpty()) {
 @@ -0,0 +0,0 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
-                         CraftMetaArmorStand.NO_BASE_PLATE.NBT,
                          CraftMetaArmorStand.SHOW_ARMS.NBT,
                          CraftMetaArmorStand.SMALL.NBT,
--                        CraftMetaArmorStand.MARKER.NBT
-+                        CraftMetaArmorStand.MARKER.NBT,
+                         CraftMetaArmorStand.MARKER.NBT,
 +                        CAN_DESTROY.NBT,
-+                        CAN_PLACE_ON.NBT
++                        CAN_PLACE_ON.NBT,
                          // Paper end
-                 ));
-             }
+                         CraftMetaCompass.LODESTONE_DIMENSION.NBT,
+                         CraftMetaCompass.LODESTONE_POS.NBT,
 @@ -0,0 +0,0 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
      }
      // Paper end
diff --git a/work/Bukkit b/work/Bukkit
index e16de3bb16..6ff65c824a 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit e16de3bb167910ba20339d2cb5f5c798827f196a
+Subproject commit 6ff65c824ad8dc9ba9228999800a0d7010904893
diff --git a/work/CraftBukkit b/work/CraftBukkit
index a13b8cfc71..3b9cf0f803 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit a13b8cfc71be4eb2c7880024a1ae191bbfd51131
+Subproject commit 3b9cf0f8031a2614ff2a041a1f3be7cc7fb4bbf4
diff --git a/work/Spigot b/work/Spigot
index 0287a20df3..4d9262cf9f 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit 0287a20df344c0bc462ddc64851e5a160a1775fc
+Subproject commit 4d9262cf9f7cf1a38525d21734708c3fe4a28bcb