From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Nassim Jahnke Date: Wed, 1 Dec 2021 12:36:25 +0100 Subject: [PATCH] Prevent sending oversized item data in equipment and metadata diff --git a/src/main/java/net/minecraft/network/syncher/EntityDataSerializers.java b/src/main/java/net/minecraft/network/syncher/EntityDataSerializers.java index 97da8896865ff0bdd4fe8f2155b0830b42051bb1..9ca897d92c5bdd2764d114c74d64c776674d6beb 100644 --- a/src/main/java/net/minecraft/network/syncher/EntityDataSerializers.java +++ b/src/main/java/net/minecraft/network/syncher/EntityDataSerializers.java @@ -42,7 +42,7 @@ public class EntityDataSerializers { public static final EntityDataSerializer ITEM_STACK = new EntityDataSerializer() { @Override public void write(FriendlyByteBuf buf, ItemStack value) { - buf.writeItem(value); + buf.writeItem(net.minecraft.world.entity.LivingEntity.sanitizeItemStack(value, true)); // Paper - prevent oversized data } @Override diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java index e7c0d214abbad1f300049f790ae54e7ea488e150..24f0d61a2fa9ac95dd26443a978209b53baf10b1 100644 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java @@ -338,7 +338,10 @@ public class ServerEntity { ItemStack itemstack = ((LivingEntity) this.entity).getItemBySlot(enumitemslot); if (!itemstack.isEmpty()) { - list.add(Pair.of(enumitemslot, itemstack.copy())); + // Paper start - prevent oversized data + final ItemStack sanitized = LivingEntity.sanitizeItemStack(itemstack.copy(), false); + list.add(Pair.of(enumitemslot, sanitized)); + // 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 6220a17852b51f45756d576af662460a28099abc..a5cf00a41c61cc9f851781cc4f55c9bb47c2f5b6 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3157,7 +3157,10 @@ public abstract class LivingEntity extends Entity implements Attackable { equipmentChanges.forEach((enumitemslot, itemstack) -> { ItemStack itemstack1 = itemstack.copy(); - list.add(Pair.of(enumitemslot, itemstack1)); + // Paper start - prevent oversized data + ItemStack toSend = sanitizeItemStack(itemstack1, true); + list.add(Pair.of(enumitemslot, toSend)); + // Paper end switch (enumitemslot.getType()) { case HAND: this.setLastHandItem(enumitemslot, itemstack1); @@ -3170,6 +3173,34 @@ public abstract class LivingEntity extends Entity implements Attackable { ((ServerLevel) this.level()).getChunkSource().broadcast(this, new ClientboundSetEquipmentPacket(this.getId(), list)); } + // Paper start - prevent oversized data + public static ItemStack sanitizeItemStack(final ItemStack itemStack, final boolean copyItemStack) { + if (itemStack.isEmpty() || !itemStack.hasTag()) { + return itemStack; + } + + final ItemStack copy = copyItemStack ? itemStack.copy() : itemStack; + final CompoundTag tag = copy.getTag(); + if (copy.is(Items.BUNDLE) && tag.get("Items") instanceof ListTag oldItems && !oldItems.isEmpty()) { + // Bundles change their texture based on their fullness. + org.bukkit.inventory.meta.BundleMeta bundleMeta = (org.bukkit.inventory.meta.BundleMeta) copy.asBukkitMirror().getItemMeta(); + int sizeUsed = 0; + for (org.bukkit.inventory.ItemStack item : bundleMeta.getItems()) { + int scale = 64 / item.getMaxStackSize(); + sizeUsed += scale * item.getAmount(); + } + // Now we add a single fake item that uses the same amount of slots as all other items. + ListTag items = new ListTag(); + items.add(new ItemStack(Items.PAPER, sizeUsed).save(new CompoundTag())); + tag.put("Items", items); + } + if (tag.get("BlockEntityTag") instanceof CompoundTag blockEntityTag) { + blockEntityTag.remove("Items"); + } + return copy; + } + // Paper end + private ItemStack getLastArmorItem(EquipmentSlot slot) { return (ItemStack) this.lastArmorItemStacks.get(slot.getIndex()); }