1.9.2-hotfix-2

pom.xml

@@ -23,7 +23,7 @@
 
     <groupId>lol.hyper</groupId>
     <artifactId>toolstats</artifactId>
-    <version>1.9.1</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 @@ package lol.hyper.toolstats.events;
 
 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 class EntityDamage implements Listener {
                         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);
+                        ItemMeta newBow = toolStats.itemLore.updatePlayerKills(heldBow, 1);
-                        if (newItem != null) {
+                        if (newBow != null) {
-                            shootingPlayerInventory.getItemInMainHand().setItemMeta(newItem);
+                            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);
+                        ItemMeta newBow = toolStats.itemLore.updateMobKills(heldBow, 1);
-                        if (newItem != null) {
+                        if (newBow != null) {
-                            shootingPlayerInventory.getItemInMainHand().setItemMeta(newItem);
+                            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());
                     }

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

@@ -72,10 +72,11 @@ public class PlayerFish implements Listener {
             PlayerInventory inventory = player.getInventory();
             boolean isMain = inventory.getItemInMainHand().getType() == Material.FISHING_ROD;
             boolean isOffHand = inventory.getItemInOffHand().getType() == Material.FISHING_ROD;
-            if (isMain) {
+            if (isMain && isOffHand) {
                 inventory.getItemInMainHand().setItemMeta(newFishingRod);
-            }
+            } else if (isMain) {
-            if (isOffHand) {
+                inventory.getItemInMainHand().setItemMeta(newFishingRod);
+            } else if (isOffHand) {
                 inventory.getItemInOffHand().setItemMeta(newFishingRod);
             }
         }

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

@@ -65,16 +65,17 @@ public class SheepShear implements Listener {
         }
 
         // update the stats
-        ItemMeta newItem = toolStats.itemLore.updateSheepSheared(heldShears, 1);
+        ItemMeta newShears = toolStats.itemLore.updateSheepSheared(heldShears, 1);
-        if (newItem != null) {
+        if (newShears != null) {
             PlayerInventory inventory = player.getInventory();
             boolean isMain = inventory.getItemInMainHand().getType() == Material.SHEARS;
             boolean isOffHand = inventory.getItemInOffHand().getType() == Material.SHEARS;
-            if (isMain) {
+            if (isMain && isOffHand) {
-                inventory.getItemInMainHand().setItemMeta(newItem);
+                inventory.getItemInMainHand().setItemMeta(newShears);
-            }
+            } else if (isMain) {
-            if (isOffHand) {
+                inventory.getItemInMainHand().setItemMeta(newShears);
-                inventory.getItemInOffHand().setItemMeta(newItem);
+            } else if (isOffHand) {
+                inventory.getItemInOffHand().setItemMeta(newShears);
             }
         }
     }

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

@@ -56,16 +56,17 @@ public class ShootBow implements Listener {
             return;
         }
 
-        ItemMeta newItem = toolStats.itemLore.updateArrowsShot(heldBow, 1);
+        ItemMeta newBow = toolStats.itemLore.updateArrowsShot(heldBow, 1);
-        if (newItem != null) {
+        if (newBow != null) {
             PlayerInventory inventory = player.getInventory();
             boolean isMain = inventory.getItemInMainHand().getType() == Material.BOW || inventory.getItemInMainHand().getType() == Material.CROSSBOW;
             boolean isOffHand = inventory.getItemInOffHand().getType() == Material.BOW || inventory.getItemInOffHand().getType() == Material.CROSSBOW;
-            if (isMain) {
+            if (isMain && isOffHand) {
-                inventory.getItemInMainHand().setItemMeta(newItem);
+                inventory.getItemInMainHand().setItemMeta(newBow);
-            }
+            } else if (isMain) {
-            if (isOffHand) {
+                inventory.getItemInMainHand().setItemMeta(newBow);
-                inventory.getItemInOffHand().setItemMeta(newItem);
+            } else if (isOffHand) {
+                inventory.getItemInOffHand().setItemMeta(newBow);
             }
         }
     }

src/main/java/lol/hyper/toolstats/tools/ItemChecker.java

@@ -220,6 +220,9 @@ public class ItemChecker {
         // if the player is holding a bow in their main hand, use that one
         // if the bow is in their offhand instead, use that one after checking main hand
         // Minecraft prioritizes main hand if the player holds in both hands
+        if (isMain && isOffHand) {
+            return main;
+        }
         if (isMain) {
             return main;
         }
@@ -246,6 +249,9 @@ public class ItemChecker {
         // if the player is holding shears in their main hand, use that one
         // if the shears are in their offhand instead, use that one after checking main hand
         // Minecraft prioritizes main hand if the player holds in both hands
+        if (isMain && isOffHand) {
+            return main;
+        }
         if (isMain) {
             return main;
         }
@@ -272,6 +278,9 @@ public class ItemChecker {
         // if the player is holding a fishing rod in their main hand, use that one
         // if the fishing rod is in their offhand instead, use that one after checking main hand
         // Minecraft prioritizes main hand if the player holds in both hands
+        if (isMain && isOffHand) {
+            return main;
+        }
         if (isMain) {
             return main;
         }

src/main/resources/config.yml

@@ -203,4 +203,4 @@ number-formats:
 # This has no use currently, but can be used for future features for dupe detection.
 generate-hash-for-items: false
 
-config-version: 9
+config-version: 10