From 222c03aa679bb94f1118ab133ae8b47a4777e86d Mon Sep 17 00:00:00 2001 From: konwboy <1919249+konwboj@users.noreply.github.com> Date: Tue, 5 May 2020 19:49:59 +0200 Subject: [PATCH] Fix block connections causing issues with TNT --- .../Protocol1_13To1_12_2.java | 2 +- .../packets/WorldPackets.java | 46 +++++++++++++++++++ 2 files changed, 47 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/Protocol1_13To1_12_2.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/Protocol1_13To1_12_2.java index 8a6d5c12a..954f50ff3 100644 --- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/Protocol1_13To1_12_2.java +++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/Protocol1_13To1_12_2.java @@ -395,7 +395,7 @@ public class Protocol1_13To1_12_2 extends Protocol { }); registerOutgoing(State.PLAY, 0x1B, 0x1C); // New packet 0x1D - NBT Query - registerOutgoing(State.PLAY, 0x1C, 0x1E); + // WorldPackets 0x1C -> 0x1E registerOutgoing(State.PLAY, 0x1E, 0x20); registerOutgoing(State.PLAY, 0x1F, 0x21); // WorldPackets 0x20 -> 0x22 diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/packets/WorldPackets.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/packets/WorldPackets.java index 28c2d801f..a4b596f7e 100644 --- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/packets/WorldPackets.java +++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/packets/WorldPackets.java @@ -254,6 +254,52 @@ public class WorldPackets { } }); + // Explosion + protocol.registerOutgoing(State.PLAY, 0x1C, 0x1E, new PacketRemapper() { + @Override + public void registerMap() { + if (!Via.getConfig().isServersideBlockConnections()) + return; + + map(Type.FLOAT); // X + map(Type.FLOAT); // Y + map(Type.FLOAT); // Z + map(Type.FLOAT); // Radius + map(Type.INT); // Record Count + + handler(new PacketHandler() { + @Override + public void handle(PacketWrapper wrapper) throws Exception { + UserConnection userConnection = wrapper.user(); + int x = (int) Math.floor(wrapper.get(Type.FLOAT, 0)); + int y = (int) Math.floor(wrapper.get(Type.FLOAT, 1)); + int z = (int) Math.floor(wrapper.get(Type.FLOAT, 2)); + int recordCount = wrapper.get(Type.INT, 0); + Position[] records = new Position[recordCount]; + + for (int i = 0; i < recordCount; i++) { + Position position = new Position( + x + wrapper.passthrough(Type.BYTE), + (short) (y + wrapper.passthrough(Type.BYTE)), + z + wrapper.passthrough(Type.BYTE)); + records[i] = position; + + // Set to air + ConnectionData.updateBlockStorage(userConnection, position.getX(), position.getY(), position.getZ(), 0); + } + + // Workaround for packet order issue + wrapper.send(Protocol1_13To1_12_2.class, true, true); + wrapper.cancel(); + + for (int i = 0; i < recordCount; i++) { + ConnectionData.update(userConnection, records[i]); + } + } + }); + } + }); + // Unload Chunk protocol.registerOutgoing(State.PLAY, 0x1D, 0x1F, new PacketRemapper() { @Override