Upstream/ViaVersion
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaVersion.git synced 2024-12-24 01:17:40 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into dev

Browse Source
This commit is contained in:
Nassim Jahnke 2021-10-23 09:58:22 +02:00
commit d8d65ea989
No known key found for this signature in database
GPG Key ID: 6BE3B555EBC5982B
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/packets/PlayerPackets.java
View File

@ -88,9 +88,8 @@ public class PlayerPackets {
protocol.registerServerbound(ServerboundPackets1_14.PLAYER_DIGGING, new PacketRemapper() {
@Override
public void registerMap() {
map(Type.VAR_INT);
map(Type.POSITION1_14, Type.POSITION);
map(Type.BYTE);
map(Type.VAR_INT); // Action
map(Type.POSITION1_14, Type.POSITION); // Position
}
});

8
common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/Protocol1_16_2To1_16_1.java
View File

@ -74,13 +74,13 @@ public class Protocol1_16_2To1_16_1 extends AbstractProtocol<ClientboundPackets1
boolean open = wrapper.read(Type.BOOLEAN);
boolean filter = wrapper.read(Type.BOOLEAN);
wrapper.write(Type.VAR_INT, 1); // Settings
wrapper.write(Type.BOOLEAN, recipeType == 0); // Crafting
wrapper.write(Type.BOOLEAN, recipeType == 0 && open); // Crafting
wrapper.write(Type.BOOLEAN, filter);
wrapper.write(Type.BOOLEAN, recipeType == 1); // Furnace
wrapper.write(Type.BOOLEAN, recipeType == 1 && open); // Furnace
wrapper.write(Type.BOOLEAN, filter);
wrapper.write(Type.BOOLEAN, recipeType == 2); // Blast Furnace
wrapper.write(Type.BOOLEAN, recipeType == 2 && open); // Blast Furnace
wrapper.write(Type.BOOLEAN, filter);
wrapper.write(Type.BOOLEAN, recipeType == 3); // Smoker
wrapper.write(Type.BOOLEAN, recipeType == 3 && open); // Smoker
wrapper.write(Type.BOOLEAN, filter);
});
}

9
common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/WorldPackets.java
View File

@ -282,13 +282,12 @@ public class WorldPackets {
protocol.registerServerbound(ServerboundPackets1_9.PLAYER_DIGGING, new PacketRemapper() {
@Override
public void registerMap() {
map(Type.VAR_INT, Type.UNSIGNED_BYTE); // 0 - Status
map(Type.POSITION); // 1 - Position
map(Type.BYTE); // 2 - Face
map(Type.VAR_INT); // Action
map(Type.POSITION); // Position
handler(new PacketHandler() {
@Override
public void handle(PacketWrapper wrapper) throws Exception {
int status = wrapper.get(Type.UNSIGNED_BYTE, 0);
int status = wrapper.get(Type.VAR_INT, 0);
if (status == 6)
wrapper.cancel();
}
@ -297,7 +296,7 @@ public class WorldPackets {
handler(new PacketHandler() {
@Override
public void handle(PacketWrapper wrapper) throws Exception {
int status = wrapper.get(Type.UNSIGNED_BYTE, 0);
int status = wrapper.get(Type.VAR_INT, 0);
if (status == 5 || status == 4 || status == 3) {
EntityTracker1_9 entityTracker = wrapper.user().getEntityTracker(Protocol1_9To1_8.class);
if (entityTracker.isBlocking()) {