From c393dc9f2160c5696ad25af68f96740ccdb29091 Mon Sep 17 00:00:00 2001
From: DoctorMacc <toy.fighter1@gmail.com>
Date: Wed, 8 Apr 2020 21:29:33 -0400
Subject: [PATCH 1/2] Initial bow support

---
 .../BedrockInventoryTransactionTranslator.java | 18 +++++++++++++-----
 .../translators/block/BlockTranslator.java     |  3 +++
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockInventoryTransactionTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockInventoryTransactionTranslator.java
index de23b8a05..3df0f6272 100644
--- a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockInventoryTransactionTranslator.java
+++ b/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockInventoryTransactionTranslator.java
@@ -41,6 +41,7 @@ import com.github.steveice10.mc.protocol.packet.ingame.client.player.ClientPlaye
 import com.github.steveice10.mc.protocol.packet.ingame.client.player.ClientPlayerUseItemPacket;
 import com.nukkitx.math.vector.Vector3f;
 import com.nukkitx.protocol.bedrock.packet.InventoryTransactionPacket;
+import org.geysermc.connector.network.translators.block.BlockTranslator;
 
 @Translator(packet = InventoryTransactionPacket.class)
 public class BedrockInventoryTransactionTranslator extends PacketTranslator<InventoryTransactionPacket> {
@@ -61,11 +62,18 @@ public class BedrockInventoryTransactionTranslator extends PacketTranslator<Inve
                 break;
             case ITEM_RELEASE:
                 if (packet.getActionType() == 0) {
-                    ClientPlayerActionPacket releaseItemPacket = new ClientPlayerActionPacket(PlayerAction.RELEASE_USE_ITEM, new Position(
-                            packet.getBlockPosition().getX(),
-                            packet.getBlockPosition().getY(),
-                            packet.getBlockPosition().getZ()
-                    ), BlockFace.values()[packet.getFace()]);
+                    ClientPlayerActionPacket releaseItemPacket;
+                    if (packet.getItemInHand().getId() == BlockTranslator.BOW) {
+                        // Followed to the Minecraft Protocol specification outlined at wiki.vg
+                        releaseItemPacket = new ClientPlayerActionPacket(PlayerAction.RELEASE_USE_ITEM, new Position(0,0,0),
+                            BlockFace.DOWN);
+                    } else {
+                        releaseItemPacket = new ClientPlayerActionPacket(PlayerAction.RELEASE_USE_ITEM, new Position(
+                                packet.getBlockPosition().getX(),
+                                packet.getBlockPosition().getY(),
+                                packet.getBlockPosition().getZ()
+                        ), BlockFace.values()[packet.getFace()]);
+                    }
                     session.getDownstream().getSession().send(releaseItemPacket);
                 }
                 break;
diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/block/BlockTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/block/BlockTranslator.java
index 906179d1f..11c700e6c 100644
--- a/connector/src/main/java/org/geysermc/connector/network/translators/block/BlockTranslator.java
+++ b/connector/src/main/java/org/geysermc/connector/network/translators/block/BlockTranslator.java
@@ -55,6 +55,9 @@ public class BlockTranslator {
     private static final Int2ObjectMap<BlockState> BEDROCK_TO_JAVA_BLOCK_MAP = new Int2ObjectOpenHashMap<>();
     private static final IntSet WATERLOGGED = new IntOpenHashSet();
 
+    // Bedrock bow ID, used in BedrockInventoryTransactionTranslator.java for bow support
+    public static final int BOW = 261;
+
     // Bedrock carpet ID, used in LlamaEntity.java for decoration
     public static final int CARPET = 171;
 

From 0521a30266df68c7cd3d798403c192cabb4faba6 Mon Sep 17 00:00:00 2001
From: DoctorMacc <toy.fighter1@gmail.com>
Date: Wed, 8 Apr 2020 22:17:29 -0400
Subject: [PATCH 2/2] Simplify

---
 .../BedrockInventoryTransactionTranslator.java      | 13 ++-----------
 .../network/translators/block/BlockTranslator.java  |  3 ---
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockInventoryTransactionTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockInventoryTransactionTranslator.java
index 3df0f6272..c9547514d 100644
--- a/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockInventoryTransactionTranslator.java
+++ b/connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockInventoryTransactionTranslator.java
@@ -62,18 +62,9 @@ public class BedrockInventoryTransactionTranslator extends PacketTranslator<Inve
                 break;
             case ITEM_RELEASE:
                 if (packet.getActionType() == 0) {
-                    ClientPlayerActionPacket releaseItemPacket;
-                    if (packet.getItemInHand().getId() == BlockTranslator.BOW) {
-                        // Followed to the Minecraft Protocol specification outlined at wiki.vg
-                        releaseItemPacket = new ClientPlayerActionPacket(PlayerAction.RELEASE_USE_ITEM, new Position(0,0,0),
+                    // Followed to the Minecraft Protocol specification outlined at wiki.vg
+                    ClientPlayerActionPacket releaseItemPacket = new ClientPlayerActionPacket(PlayerAction.RELEASE_USE_ITEM, new Position(0,0,0),
                             BlockFace.DOWN);
-                    } else {
-                        releaseItemPacket = new ClientPlayerActionPacket(PlayerAction.RELEASE_USE_ITEM, new Position(
-                                packet.getBlockPosition().getX(),
-                                packet.getBlockPosition().getY(),
-                                packet.getBlockPosition().getZ()
-                        ), BlockFace.values()[packet.getFace()]);
-                    }
                     session.getDownstream().getSession().send(releaseItemPacket);
                 }
                 break;
diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/block/BlockTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/block/BlockTranslator.java
index 11c700e6c..906179d1f 100644
--- a/connector/src/main/java/org/geysermc/connector/network/translators/block/BlockTranslator.java
+++ b/connector/src/main/java/org/geysermc/connector/network/translators/block/BlockTranslator.java
@@ -55,9 +55,6 @@ public class BlockTranslator {
     private static final Int2ObjectMap<BlockState> BEDROCK_TO_JAVA_BLOCK_MAP = new Int2ObjectOpenHashMap<>();
     private static final IntSet WATERLOGGED = new IntOpenHashSet();
 
-    // Bedrock bow ID, used in BedrockInventoryTransactionTranslator.java for bow support
-    public static final int BOW = 261;
-
     // Bedrock carpet ID, used in LlamaEntity.java for decoration
     public static final int CARPET = 171;