Upstream/ViaVersion
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaVersion.git synced 2024-11-28 21:15:51 +01:00
Code Issues Projects Releases Wiki Activity

Fix drag desync

Browse Source
This commit is contained in:
KennyTV 2021-03-15 14:50:58 +01:00
parent b589561932
commit 0986e174a2
No known key found for this signature in database
GPG Key ID: 6BE3B555EBC5982B
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
common/src/main/java/us/myles/ViaVersion/protocols/protocol1_17to1_16_4/packets/InventoryPackets.java
View File

@ -35,7 +35,7 @@ public class InventoryPackets {
} }
}); });
// This will likely cause desync issues // This will cause desync issues to clients with a high latency
protocol.registerIncoming(ServerboundPackets1_17.CLICK_WINDOW, new PacketRemapper() { protocol.registerIncoming(ServerboundPackets1_17.CLICK_WINDOW, new PacketRemapper() {
@Override @Override
public void registerMap() { public void registerMap() {
@ -43,7 +43,7 @@ public class InventoryPackets {
map(Type.SHORT); // Slot map(Type.SHORT); // Slot
map(Type.BYTE); // Button map(Type.BYTE); // Button
create(wrapper -> wrapper.write(Type.SHORT, (short) 0)); // Action id - doesn't matter, as the sent out confirmation packet will be cancelled create(wrapper -> wrapper.write(Type.SHORT, (short) 0)); // Action id - doesn't matter, as the sent out confirmation packet will be cancelled
map(Type.VAR_INT); // Mode map(Type.VAR_INT); // Action
handler(wrapper -> { handler(wrapper -> {
// Affected items - throw them away! // Affected items - throw them away!
@ -53,13 +53,23 @@ public class InventoryPackets {
wrapper.read(Type.FLAT_VAR_INT_ITEM); wrapper.read(Type.FLAT_VAR_INT_ITEM);
} }
// Carried item // 1.17 clients send the then carried item, but 1.16 expects the clicked one
toServer(wrapper.passthrough(Type.FLAT_VAR_INT_ITEM)); Item item = wrapper.read(Type.FLAT_VAR_INT_ITEM);
int action = wrapper.get(Type.VAR_INT, 0);
if (action == 5) {
// Quick craft (= dragging / mouse movement while clicking on an empty slot)
// The server always expects an empty item here
item = null;
} else {
// Use the item sent
toServer(item);
}
wrapper.write(Type.FLAT_VAR_INT_ITEM, item);
}); });
} }
}); });
//TODO fix drags not working at all, try to work against desync issues with keepalive abuise
protocol.registerOutgoing(ClientboundPackets1_16_2.WINDOW_CONFIRMATION, null, new PacketRemapper() { protocol.registerOutgoing(ClientboundPackets1_16_2.WINDOW_CONFIRMATION, null, new PacketRemapper() {
@Override @Override
public void registerMap() { public void registerMap() {