Updated Upstream (CraftBukkit/Spigot) (#7580)

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:
881e06e5 PR-725: Add Item Unlimited Lifetime APIs

CraftBukkit Changes:
74c08312 SPIGOT-6962: Call EntityChangeBlockEvent when when FallingBlockEntity starts to fall
64db5126 SPIGOT-6959: Make /loot command ignore empty items for spawn
2d760831 Increase outdated build delay
9ed7e4fb SPIGOT-6138, SPIGOT-6415: Don't call CreatureSpawnEvent after cross-dimensional travel
fc4ad813 SPIGOT-6895: Trees grown with applyBoneMeal() don't fire the StructureGrowthEvent
59733a2e SPIGOT-6961: Actually return a copy of the ItemMeta

Spigot Changes:
ffceeae3 SPIGOT-6956: Drop unload queue patch as attempt at fixing stop issue
e19ddabd PR-1011: Add Item Unlimited Lifetime APIs
34d40b0e SPIGOT-2942: give command fires PlayerDropItemEvent, cancelling it causes Item Duplication

1 files changed, 102 insertions, 0 deletions

diff --git a/patches/server/0805-Hide-unnecessary-itemmeta-from-clients.patch b/patches/server/0805-Hide-unnecessary-itemmeta-from-clients.patch
new file mode 100644
index 0000000000..7290d9ffe1
--- /dev/null
+++ b/patches/server/0805-Hide-unnecessary-itemmeta-from-clients.patch
@@ -0,0 +1,102 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Noah van der Aa <[email protected]>
+Date: Tue, 3 Aug 2021 17:28:27 +0200
+Subject: [PATCH] Hide unnecessary itemmeta from clients
+
+
+diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+index ed49f70d6a259dcbc72d9fe8addc42c4717a9e59..1d7d6859531a470eea5d0cf25935250f7cba7d2a 100644
+--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
++++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+@@ -911,6 +911,13 @@ public class PaperWorldConfig {
+         behaviorTickRates = loadTickRates("behavior");
+     }
+ 
++    public boolean hideItemmetaFromClients = false;
++    public boolean hideDurabilityFromClients = false;
++    private void getHideItemmetaFromClients() {
++        hideItemmetaFromClients = getBoolean("anticheat.obfuscation.items.hide-itemmeta", hideItemmetaFromClients);
++        hideDurabilityFromClients = getBoolean("anticheat.obfuscation.items.hide-durability", hideDurabilityFromClients);
++    }
++
+     private com.google.common.collect.Table<String, String, Integer> loadTickRates(String type) {
+         log("  " + type + ":");
+         com.google.common.collect.Table<String, String, Integer> table = com.google.common.collect.HashBasedTable.create();
+diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
+index 7464336f0c7ee59e59552afbad7bed0afcecef87..fe29bf349b987d633b185b9d44d221053fa2cc83 100644
+--- a/src/main/java/net/minecraft/server/level/ServerEntity.java
++++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
+@@ -321,7 +321,7 @@ public class ServerEntity {
+                 if (!itemstack.isEmpty()) {
+                     // Paper start - prevent oversized data
+                     final ItemStack sanitized = LivingEntity.sanitizeItemStack(itemstack.copy(), false);
+-                    list.add(Pair.of(enumitemslot, sanitized));
++                    list.add(Pair.of(enumitemslot, ((LivingEntity) this.entity).stripMeta(sanitized, false))); // Paper - remove unnecessary item meta
+                     // Paper end
+                 }
+             }
+diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
+index 626e53564d4130b98440982e174fd7c23b7df863..a1c43c61ab3a618f864bfefb9e481386d82621e8 100644
+--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
++++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
+@@ -3079,7 +3079,7 @@ public abstract class LivingEntity extends Entity {
+ 
+             // Paper start - prevent oversized data
+             ItemStack toSend = sanitizeItemStack(itemstack1, true);
+-            list.add(Pair.of(enumitemslot, toSend));
++            list.add(Pair.of(enumitemslot, stripMeta(toSend, toSend == itemstack1))); // Paper - hide unnecessary item meta
+             // Paper end
+             switch (enumitemslot.getType()) {
+                 case HAND:
+@@ -3093,6 +3093,51 @@ public abstract class LivingEntity extends Entity {
+         ((ServerLevel) this.level).getChunkSource().broadcast(this, new ClientboundSetEquipmentPacket(this.getId(), list));
+     }
+ 
++    // Paper start - hide unnecessary item meta
++    public ItemStack stripMeta(final ItemStack itemStack, final boolean copyItemStack) {
++        if (itemStack.isEmpty() || (!itemStack.hasTag() && itemStack.getCount() < 2)) {
++            return itemStack;
++        }
++
++        final ItemStack copy = copyItemStack ? itemStack.copy() : itemStack;
++        if (level.paperConfig.hideDurabilityFromClients) {
++            // Only show damage values for elytra's, since they show a different texture when broken.
++            if (!copy.is(Items.ELYTRA) || copy.getDamageValue() < copy.getMaxDamage() - 1) {
++                copy.setDamageValue(0);
++            }
++        }
++
++        if (level.paperConfig.hideItemmetaFromClients) {
++            // Some resource packs show different textures when there is more than one item. Since this shouldn't provide a big advantage,
++            // we'll tell the client if there's one or (more than) two items.
++            copy.setCount(copy.getCount() > 1 ? 2 : 1);
++            // We can't just strip out display, leather helmets still use the display.color tag.
++            final CompoundTag tag = copy.getTag();
++            if (tag != null) {
++                if (tag.get("display") instanceof CompoundTag displayTag) {
++                    displayTag.remove("Lore");
++                    displayTag.remove("Name");
++                }
++
++                if (tag.get("Enchantments") instanceof ListTag enchantmentsTag && !enchantmentsTag.isEmpty()) {
++                    // The client still renders items with the enchantment glow if the enchantments tag contains at least one (empty) child.
++                    ListTag enchantments = new ListTag();
++                    CompoundTag fakeEnchantment = new CompoundTag();
++                    // Soul speed boots generate client side particles.
++                    if (EnchantmentHelper.getItemEnchantmentLevel(Enchantments.SOUL_SPEED, itemStack) > 0) {
++                        fakeEnchantment.putString("id", org.bukkit.enchantments.Enchantment.SOUL_SPEED.getKey().asString());
++                        fakeEnchantment.putInt("lvl", 1);
++                    }
++                    enchantments.add(fakeEnchantment);
++                    tag.put("Enchantments", enchantments);
++                }
++                tag.remove("AttributeModifiers");
++            }
++        }
++        return copy;
++    }
++    // Paper end
++
+     // Paper start - prevent oversized data
+     public static ItemStack sanitizeItemStack(final ItemStack itemStack, final boolean copyItemStack) {
+         if (itemStack.isEmpty() || !itemStack.hasTag()) {