OpenSource/GeyserMC
OpenSource/GeyserMC
1
0
Fork 0
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-12-23 06:50:26 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix Merchant Inventory Transaction (#1017)

Browse source
This commit is contained in:
bundabrg 2020-07-26 11:06:06 +08:00 committed by GitHub
parent 5c2a225533
commit d03f56e7e8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
connector/src/main/java/org/geysermc/connector/network/translators/inventory/MerchantInventoryTranslator.java
View file

@ -60,7 +60,8 @@ public class MerchantInventoryTranslator extends BaseInventoryTranslator {
@Override @Override
public int bedrockSlotToJava(InventoryActionData action) { public int bedrockSlotToJava(InventoryActionData action) {
if (action.getSource().getContainerId() == ContainerId.UI) { switch (action.getSource().getContainerId()) {
case ContainerId.UI:
switch (action.getSlot()) { switch (action.getSlot()) {
case 4: case 4:
return 0; return 0;
@ -69,6 +70,13 @@ public class MerchantInventoryTranslator extends BaseInventoryTranslator {
case 50: case 50:
return 2; return 2;
} }
break;
case -28: // Trading 1?
return 0;
case -29: // Trading 2?
return 1;
case -30: // Trading Output?
return 2;
} }
return super.bedrockSlotToJava(action); return super.bedrockSlotToJava(action);
} }
@ -109,11 +117,9 @@ public class MerchantInventoryTranslator extends BaseInventoryTranslator {
@Override @Override
public void translateActions(GeyserSession session, Inventory inventory, List<InventoryActionData> actions) { public void translateActions(GeyserSession session, Inventory inventory, List<InventoryActionData> actions) {
for (InventoryActionData action : actions) { if (actions.stream().anyMatch(a -> a.getSource().getContainerId() == -31)) {
if (action.getSource().getType() == InventorySource.Type.NON_IMPLEMENTED_TODO) {
return; return;
} }
}
super.translateActions(session, inventory, actions); super.translateActions(session, inventory, actions);
} }