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

Handle optional item cost nullability

Browse Source
This commit is contained in:
Nassim Jahnke 2024-06-07 13:51:28 +02:00
parent 842cb8dac5
commit 1e244a126d
No known key found for this signature in database
GPG Key ID: EF6771C01F6EF02F
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/rewriter/BlockItemPacketRewriter1_20_5.java
View File

@ -307,7 +307,13 @@ public final class BlockItemPacketRewriter1_20_5 extends ItemRewriter<Clientboun
final Item output = handleNonEmptyItemToClient(wrapper.user(), wrapper.read(Types.ITEM1_20_2));
wrapper.write(Types1_20_5.ITEM, output);
final Item secondInput = handleItemToClient(wrapper.user(), wrapper.read(Types.ITEM1_20_2));
Item secondInput = wrapper.read(Types.ITEM1_20_2);
if (secondInput != null) {
secondInput = handleItemToClient(wrapper.user(), secondInput);
if (secondInput.isEmpty()) {
secondInput = null;
}
}
wrapper.write(Types1_20_5.OPTIONAL_ITEM_COST, secondInput);
wrapper.passthrough(Types.BOOLEAN); // Out of stock

7
common/src/main/java/com/viaversion/viaversion/rewriter/ItemRewriter.java
View File

@ -296,8 +296,11 @@ public class ItemRewriter<C extends ClientboundPacketType, S extends Serverbound
handleClientboundItem(wrapper); // Result
final Item secondInput = wrapper.read(optionalCostType);
wrapper.write(mappedOptionalCostType, handleItemToClient(wrapper.user(), secondInput));
Item secondInput = wrapper.read(optionalCostType);
if (secondInput != null) {
handleItemToClient(wrapper.user(), secondInput);
}
wrapper.write(mappedOptionalCostType, secondInput);
wrapper.passthrough(Types.BOOLEAN); // Out of stock
wrapper.passthrough(Types.INT); // Number of trade uses