Fixed TODO: "Is main hand always the correct slot?"

Co-authored-by: mastercoms <mastercoms@tutanota.de>
GlowstoneMC · May 21, 2018 · db9e671 · db9e671
1 parent 9747d77
commit db9e671
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/main/java/net/glowstone/block/itemtype/ItemBow.java b/src/main/java/net/glowstone/block/itemtype/ItemBow.java
@@ -103,8 +103,12 @@ public void endUse(GlowPlayer player, ItemStack bow) {
             if (ThreadLocalRandom.current().nextDouble() < 0.2) {
                 launchedArrow.setCritical(true);
             }
-            // TODO: Is main hand always the correct slot?
-            player.setItemInHand(InventoryUtil.damageItem(player, bow));
+
+            if (player.getItemInHand().getType() == Material.BOW) {
+                player.setItemInHand(InventoryUtil.damageItem(player, bow));
+            } else {
+                player.getInventory().setItemInOffHand(InventoryUtil.damageItem(player, bow));
+            }
         }
         player.setUsageItem(null);
         player.setUsageTime(0);