Update pom.xml

closes #6

pom.xml

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

src/main/java/lol/hyper/toolstats/ToolStats.java

@@ -57,8 +57,6 @@ public final class ToolStats extends JavaPlugin {
     // used for tracking new elytras
     public final NamespacedKey newElytra = new NamespacedKey(this, "new");
 
-    public final Set<NamespacedKey> keys = new HashSet<>();
-
     public BlocksMined blocksMined;
     public ChunkPopulate chunkPopulate;
     public CraftItem craftItem;
@@ -111,15 +109,6 @@ public final class ToolStats extends JavaPlugin {
         new Metrics(this, 14110);
 
         Bukkit.getScheduler().runTaskAsynchronously(this, this::checkForUpdates);
-
-        keys.add(genericOwner);
-        keys.add(timeCreated);
-        keys.add(swordPlayerKills);
-        keys.add(swordMobKills);
-        keys.add(genericMined);
-        keys.add(fishingRodCaught);
-        keys.add(shearsSheared);
-        keys.add(armorDamage);
     }
 
     public void loadConfig() {

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

@@ -126,7 +126,9 @@ public class EntityDamage implements Listener {
             PlayerInventory inventory = player.getInventory();
             for (ItemStack armor : inventory.getArmorContents()) {
                 if (armor != null) {
-                    updateArmorDamage(armor, event.getDamage());
+                    if (isArmor(armor.getType().toString().toLowerCase(Locale.ROOT))) {
+                        updateArmorDamage(armor, event.getFinalDamage());
+                    }
                 }
             }
         }
@@ -144,7 +146,9 @@ public class EntityDamage implements Listener {
             PlayerInventory inventory = player.getInventory();
             for (ItemStack armor : inventory.getArmorContents()) {
                 if (armor != null) {
-                    updateArmorDamage(armor, event.getDamage());
+                    if (isArmor(armor.getType().toString().toLowerCase(Locale.ROOT))) {
+                        updateArmorDamage(armor, event.getFinalDamage());
+                    }
                 }
             }
         }
@@ -162,7 +166,9 @@ public class EntityDamage implements Listener {
             PlayerInventory inventory = player.getInventory();
             for (ItemStack armor : inventory.getArmorContents()) {
                 if (armor != null) {
-                    updateArmorDamage(armor, event.getDamage());
+                    if (isArmor(armor.getType().toString().toLowerCase(Locale.ROOT))) {
+                        updateArmorDamage(armor, event.getFinalDamage());
+                    }
                 }
             }
         }
@@ -351,4 +357,13 @@ public class EntityDamage implements Listener {
         }
         itemStack.setItemMeta(meta);
     }
+
+    /**
+     * Check if item is an armor piece.
+     * @param itemType The item type, not name.
+     * @return If the item is an armor piece.
+     */
+    private boolean isArmor(String itemType) {
+        return itemType.endsWith("_helmet") || itemType.endsWith("_chestplate") || itemType.endsWith("_leggings") || itemType.endsWith("_boots");
+    }
 }