Upstream/ViaVersion
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaVersion.git synced 2025-01-20 22:41:32 +01:00
Code Issues Projects Releases Wiki Activity

Fix trim material ids at tail

Browse Source
This commit is contained in:
Nassim Jahnke 2024-04-24 10:11:22 +02:00
parent b78f9d350b
commit c5e6fa7d0c
No known key found for this signature in database
GPG Key ID: EF6771C01F6EF02F
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/data/TrimMaterials1_20_3.java
View File

@ -27,11 +27,11 @@ public final class TrimMaterials1_20_3 {
"copper", "copper",
"diamond", "diamond",
"emerald", "emerald",
"quartz",
"gold", "gold",
"iron", "iron",
"lapis", "lapis",
"netherite", "netherite",
"quartz",
"redstone" "redstone"
); );

1
common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/BlockItemPacketRewriter1_20_5.java
View File

@ -892,6 +892,7 @@ public final class BlockItemPacketRewriter1_20_5 extends ItemRewriter<Clientboun
if (id == -1) { if (id == -1) {
return; return;
} }
materialHolder = Holder.of(id); materialHolder = Holder.of(id);
} else if (materialTag instanceof CompoundTag) { } else if (materialTag instanceof CompoundTag) {
final CompoundTag materialCompoundTag = (CompoundTag) materialTag; final CompoundTag materialCompoundTag = (CompoundTag) materialTag;

1
common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/StructuredDataConverter.java
View File

@ -668,6 +668,7 @@ public final class StructuredDataConverter {
if (unmappedId != -1) { if (unmappedId != -1) {
return unmappedId; return unmappedId;
} }
final IntTag itemBackupTag = tag.getIntTag(ITEM_BACKUP_TAG_KEY); final IntTag itemBackupTag = tag.getIntTag(ITEM_BACKUP_TAG_KEY);
if (itemBackupTag != null) { if (itemBackupTag != null) {
tag.remove(ITEM_BACKUP_TAG_KEY); tag.remove(ITEM_BACKUP_TAG_KEY);