1.9.2-hotfix-2

Author: hyperdefined

pom.xml

@@ -23,7 +23,7 @@
 
     <groupId>lol.hyper</groupId>
     <artifactId>toolstats</artifactId>
-    <version>1.9.2-hotfix</version>
+    <version>1.9.2-hotfix-2</version>
     <packaging>jar</packaging>
 
     <name>ToolStats</name>

src/main/java/lol/hyper/toolstats/events/EntityDamage.java

@@ -19,6 +19,7 @@
 
 import lol.hyper.toolstats.ToolStats;
 import org.bukkit.GameMode;
+import org.bukkit.Material;
 import org.bukkit.entity.Arrow;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
@@ -119,17 +120,32 @@ public void onDamage(EntityDamageByEntityEvent event) {
                         return;
                     }
 
+                    boolean isMain = shootingPlayerInventory.getItemInMainHand().getType() == Material.BOW ||  shootingPlayerInventory.getItemInMainHand().getType() == Material.CROSSBOW;
+                    boolean isOffHand =  shootingPlayerInventory.getItemInOffHand().getType() == Material.BOW || shootingPlayerInventory.getItemInOffHand().getType() == Material.CROSSBOW;
+
                     // player is shooting another player
                     if (mobBeingAttacked instanceof Player) {
-                        ItemMeta newItem = toolStats.itemLore.updatePlayerKills(heldBow, 1);
-                        if (newItem != null) {
-                            shootingPlayerInventory.getItemInMainHand().setItemMeta(newItem);
+                        ItemMeta newBow = toolStats.itemLore.updatePlayerKills(heldBow, 1);
+                        if (newBow != null) {
+                            if (isMain && isOffHand) {
+                                shootingPlayerInventory.getItemInMainHand().setItemMeta(newBow);
+                            } else if (isMain) {
+                                shootingPlayerInventory.getItemInMainHand().setItemMeta(newBow);
+                            } else if (isOffHand) {
+                                shootingPlayerInventory.getItemInOffHand().setItemMeta(newBow);
+                            }
                         }
                     } else {
                         // player is shooting a mob
-                        ItemMeta newItem = toolStats.itemLore.updateMobKills(heldBow, 1);
-                        if (newItem != null) {
-                            shootingPlayerInventory.getItemInMainHand().setItemMeta(newItem);
+                        ItemMeta newBow = toolStats.itemLore.updateMobKills(heldBow, 1);
+                        if (newBow != null) {
+                            if (isMain && isOffHand) {
+                                shootingPlayerInventory.getItemInMainHand().setItemMeta(newBow);
+                            } else if (isMain) {
+                                shootingPlayerInventory.getItemInMainHand().setItemMeta(newBow);
+                            } else if (isOffHand) {
+                                shootingPlayerInventory.getItemInOffHand().setItemMeta(newBow);
+                            }
                         }
                         trackedMobs.add(mobBeingAttacked.getUniqueId());
                     }