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

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

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