Upstream/ViaBackwards
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaBackwards.git synced 2024-06-26 10:25:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix item data handling order

Browse Source
This commit is contained in:
Nassim Jahnke 2024-06-16 11:05:50 +02:00
parent f91a25cba7
commit 5f57041413
No known key found for this signature in database
GPG Key ID: EF6771C01F6EF02F
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
common/src/main/java/com/viaversion/viabackwards/protocol/v1_21to1_20_5/rewriter/BlockItemPacketRewriter1_21.java
View File

@ -47,7 +47,6 @@ import com.viaversion.viaversion.rewriter.BlockRewriter;
import com.viaversion.viaversion.rewriter.IdRewriteFunction;
import java.util.ArrayList;
import java.util.Arrays;
import org.checkerframework.checker.nullness.qual.Nullable;
import static com.viaversion.viaversion.protocols.v1_20_5to1_21.rewriter.BlockItemPacketRewriter1_21.downgradeItemData;
import static com.viaversion.viaversion.protocols.v1_20_5to1_21.rewriter.BlockItemPacketRewriter1_21.updateItemData;
@ -148,9 +147,10 @@ public final class BlockItemPacketRewriter1_21 extends BackwardsStructuredItemRe
enchantmentRewriter.rewriteEnchantmentsToClient(data, StructuredDataKey.ENCHANTMENTS, idRewriteFunction, descriptionSupplier, false);
enchantmentRewriter.rewriteEnchantmentsToClient(data, StructuredDataKey.STORED_ENCHANTMENTS, idRewriteFunction, descriptionSupplier, true);
// Order is important
super.handleItemToClient(connection, item);
downgradeItemData(item);
return super.handleItemToClient(connection, item);
return item;
}
@Override
@ -170,9 +170,10 @@ public final class BlockItemPacketRewriter1_21 extends BackwardsStructuredItemRe
// Restore originals if present
enchantmentRewriter.handleToServer(item);
// Order is important
super.handleItemToServer(connection, item);
updateItemData(item);
return super.handleItemToServer(connection, item);
return item;
}
private void rewriteEnchantmentToServer(final EnchantmentsPaintingsStorage storage, final Item item, final StructuredDataKey<Enchantments> key) {