From ff5ad2385ccffb8f544b950ecd437ed57cd3e390 Mon Sep 17 00:00:00 2001
From: Redned <redned235@gmail.com>
Date: Sat, 23 Oct 2021 02:30:03 -0500
Subject: [PATCH 1/2] Fix recipe book glitch on <1.16.2 servers (#2715)

---
 .../protocol1_16_2to1_16_1/Protocol1_16_2To1_16_1.java    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/Protocol1_16_2To1_16_1.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/Protocol1_16_2To1_16_1.java
index 57505fdac..41e9d7e89 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/Protocol1_16_2To1_16_1.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16_2to1_16_1/Protocol1_16_2To1_16_1.java
@@ -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);
                 });
             }

From d80735e24823b22fe79c1f79bec36ddf40f20c4a Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <jahnke.nassim@gmail.com>
Date: Sat, 23 Oct 2021 09:58:11 +0200
Subject: [PATCH 2/2] Read player digging action as var int Does not matter for
 small numbers, but properly reflects Vanilla's reading/writing type

---
 .../protocol1_14to1_13_2/packets/PlayerPackets.java      | 5 ++---
 .../protocols/protocol1_9to1_8/packets/WorldPackets.java | 9 ++++-----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/packets/PlayerPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/packets/PlayerPackets.java
index c1ed43394..2748a81aa 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/packets/PlayerPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_14to1_13_2/packets/PlayerPackets.java
@@ -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
             }
         });
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/WorldPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/WorldPackets.java
index 7cd631d87..5d0685306 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/WorldPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/WorldPackets.java
@@ -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()) {