From 05e056a28b71c5739a7ffc59f7804930561c9529 Mon Sep 17 00:00:00 2001 From: Myles Date: Tue, 23 Apr 2019 17:28:26 +0100 Subject: [PATCH] Cancel packets correctly so they don't mess bungee up --- .../Protocol1_14To1_13_2.java | 40 +++++++++++++++++-- 1 file changed, 37 insertions(+), 3 deletions(-) diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14to1_13_2/Protocol1_14To1_13_2.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14to1_13_2/Protocol1_14To1_13_2.java index 1cc1d0d4e..5db69490f 100644 --- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14to1_13_2/Protocol1_14To1_13_2.java +++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14to1_13_2/Protocol1_14To1_13_2.java @@ -194,7 +194,18 @@ public class Protocol1_14To1_13_2 extends Protocol { } }); - registerIncoming(State.PLAY, -1, 0x02); //Set Difficulty packet added in 19w11a + //Set Difficulty packet added in 19w11a + registerIncoming(State.PLAY, -1, 0x02, new PacketRemapper() { + @Override + public void registerMap() { + handler(new PacketHandler() { + @Override + public void handle(PacketWrapper wrapper) { + wrapper.cancel(); + } + }); + } + }); registerIncoming(State.PLAY, 0x02, 0x03); registerIncoming(State.PLAY, 0x03, 0x04); registerIncoming(State.PLAY, 0x04, 0x05); @@ -207,7 +218,19 @@ public class Protocol1_14To1_13_2 extends Protocol { registerIncoming(State.PLAY, 0x0C, 0x0D); registerIncoming(State.PLAY, 0x0D, 0x0E); - registerIncoming(State.PLAY, -1, 0x10); //Lock Difficulty packet added in 19w11a + + //Lock Difficulty packet added in 19w11a + registerIncoming(State.PLAY, -1, 0x10, new PacketRemapper() { + @Override + public void registerMap() { + handler(new PacketHandler() { + @Override + public void handle(PacketWrapper wrapper) { + wrapper.cancel(); + } + }); + } + }); registerIncoming(State.PLAY, 0x0E, 0x0F); registerIncoming(State.PLAY, 0x0F, 0x14); registerIncoming(State.PLAY, 0x10, 0x11); @@ -230,7 +253,18 @@ public class Protocol1_14To1_13_2 extends Protocol { registerIncoming(State.PLAY, 0x23, 0x25); - registerIncoming(State.PLAY, -1, 0x27); //Unknown packet added in 19w13a + //Unknown packet added in 19w13a + registerIncoming(State.PLAY, -1, 0x27, new PacketRemapper() { + @Override + public void registerMap() { + handler(new PacketHandler() { + @Override + public void handle(PacketWrapper wrapper) { + wrapper.cancel(); + } + }); + } + }); registerIncoming(State.PLAY, 0x27, 0x2A); registerIncoming(State.PLAY, 0x28, 0x2B);