SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SPIGOT-7664: Item meta should prevail over block states

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2024-05-10 19:33:23 +10:00
parent 317917800c
commit 850e49f268
3 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBlockState.java
View File

@@ -212,7 +212,7 @@ public class CraftMetaBlockState extends CraftMetaItem implements BlockStateMeta
tag.put(BLOCK_ENTITY_TAG, CustomData.of(blockEntityTag.getSnapshotNBTWithoutComponents()));
for (TypedDataComponent<?> component : blockEntityTag.collectComponents()) {
tag.builder.set(component);
tag.putIfAbsent(component);
}
}
}

10
paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
View File

@@ -45,6 +45,7 @@ import net.minecraft.core.IRegistryCustom;
import net.minecraft.core.component.DataComponentPatch;
import net.minecraft.core.component.DataComponentType;
import net.minecraft.core.component.DataComponents;
import net.minecraft.core.component.TypedDataComponent;
import net.minecraft.core.registries.Registries;
import net.minecraft.nbt.DynamicOpsNBT;
import net.minecraft.nbt.NBTBase;
@@ -173,13 +174,20 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
static final class Applicator {
final DataComponentPatch.a builder = DataComponentPatch.builder();
private final DataComponentPatch.a builder = DataComponentPatch.builder();
<T> Applicator put(ItemMetaKeyType<T> key, T value) {
builder.set(key.TYPE, value);
return this;
}
<T> Applicator putIfAbsent(TypedDataComponent<?> component) {
if (!builder.isSet(component.type())) {
builder.set(component);
}
return this;
}
DataComponentPatch build() {
return builder.build();
}