mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-29 19:52:55 +01:00
90fe0d58a5
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: 897a0a23 SPIGOT-5753: Back PotionType by a minecraft registry 255b2aa1 SPIGOT-7080: Add World#locateNearestBiome ff984826 Remove javadoc.io doc links CraftBukkit Changes: 71b0135cc SPIGOT-5753: Back PotionType by a minecraft registry a6bcb8489 SPIGOT-7080: Add World#locateNearestBiome ad0e57434 SPIGOT-7502: CraftMetaItem - cannot deserialize BlockStateTag b3efca57a SPIGOT-6400: Use Mockito instead of InvocationHandler 38c599f9d PR-1272: Only allow one entity in CraftItem instead of two f065271ac SPIGOT-7498: ChunkSnapshot.getBlockEmittedLight() gets 64 blocks upper in Overworld Spigot Changes: e0e223fe Remove javadoc.io doc links
125 lines
7.4 KiB
Diff
125 lines
7.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Noah van der Aa <ndvdaa@gmail.com>
|
|
Date: Tue, 3 Aug 2021 17:28:27 +0200
|
|
Subject: [PATCH] Hide unnecessary itemmeta from clients
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
|
|
index 8d2870c780c4c253f6570c7ef73f6e7c2ccc46ad..0cbb5dd17c5b37ad90ce11a31b64470722026d06 100644
|
|
--- a/src/main/java/net/minecraft/server/level/ServerEntity.java
|
|
+++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
|
|
@@ -337,7 +337,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/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
index e8ca93305e8baaee3e72932b630a2d6907444593..65f36454b08d7527aca0d3e667979fd58f3dcf6f 100644
|
|
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
|
@@ -2550,8 +2550,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
|
|
// Refresh the current entity metadata
|
|
entity.getEntityData().refresh(player);
|
|
// SPIGOT-7136 - Allays
|
|
- if (entity instanceof Allay) {
|
|
- send(new ClientboundSetEquipmentPacket(entity.getId(), Arrays.stream(net.minecraft.world.entity.EquipmentSlot.values()).map((slot) -> Pair.of(slot, ((LivingEntity) entity).getItemBySlot(slot).copy())).collect(Collectors.toList())));
|
|
+ if (entity instanceof Allay allay) { // Paper
|
|
+ send(new ClientboundSetEquipmentPacket(entity.getId(), Arrays.stream(net.minecraft.world.entity.EquipmentSlot.values()).map((slot) -> Pair.of(slot, allay.stripMeta(allay.getItemBySlot(slot), true))).collect(Collectors.toList()))); // Paper - remove unnecessary item meta
|
|
player.containerMenu.sendAllDataToRemote();
|
|
}
|
|
}
|
|
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
index f8738a28fb30c8fdb52ed3e6f8000144129c1f00..4dc9647b9c7206b1e98554d2db0f193b0dce0a94 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
|
@@ -3196,7 +3196,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
|
|
|
|
// 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:
|
|
@@ -3210,6 +3210,77 @@ public abstract class LivingEntity extends Entity implements Attackable {
|
|
((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 (this.level().paperConfig().anticheat.obfuscation.items.hideDurability) {
|
|
+ // 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);
|
|
+ }
|
|
+ }
|
|
+
|
|
+ final CompoundTag tag = copy.getTag();
|
|
+ if (this.level().paperConfig().anticheat.obfuscation.items.hideItemmeta) {
|
|
+ // 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.
|
|
+ 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");
|
|
+ tag.remove("Unbreakable");
|
|
+ tag.remove("PublicBukkitValues"); // Persistent data container1
|
|
+
|
|
+ // Books
|
|
+ tag.remove("author");
|
|
+ tag.remove("filtered_title");
|
|
+ tag.remove("pages");
|
|
+ tag.remove("filtered_pages");
|
|
+ tag.remove("title");
|
|
+ tag.remove("generation");
|
|
+
|
|
+ // Filled maps
|
|
+ tag.remove("map");
|
|
+ tag.remove("map_scale_direction");
|
|
+ tag.remove("map_to_lock");
|
|
+ }
|
|
+ }
|
|
+
|
|
+ if (this.level().paperConfig().anticheat.obfuscation.items.hideItemmetaWithVisualEffects && tag != null) {
|
|
+ // Lodestone compasses
|
|
+ tag.remove("LodestonePos");
|
|
+ if (tag.contains("LodestoneDimension")) {
|
|
+ // The client shows the glint if either the position or the dimension is present, so we just wipe
|
|
+ // the position and fake the dimension
|
|
+ tag.putString("LodestoneDimension", "paper:paper");
|
|
+ }
|
|
+ }
|
|
+
|
|
+ return copy;
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
// Paper start - prevent oversized data
|
|
public static ItemStack sanitizeItemStack(final ItemStack itemStack, final boolean copyItemStack) {
|
|
if (itemStack.isEmpty() || !itemStack.hasTag()) {
|