From 24d30f6059049b5cd87215c4f617849057df483e Mon Sep 17 00:00:00 2001
From: hyperdefined <contact@hyper.lol>
Date: Thu, 13 Oct 2022 18:09:19 -0400
Subject: [PATCH] fix deepsource problems

---
 src/main/java/lol/hyper/toolstats/ToolStats.java    |  2 +-
 .../lol/hyper/toolstats/events/BlocksMined.java     |  4 +---
 .../lol/hyper/toolstats/events/EntityDamage.java    | 13 ++++---------
 .../java/lol/hyper/toolstats/events/PlayerFish.java |  4 +---
 .../java/lol/hyper/toolstats/events/SheepShear.java |  4 +---
 5 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/src/main/java/lol/hyper/toolstats/ToolStats.java b/src/main/java/lol/hyper/toolstats/ToolStats.java
index 8d5681c..bca9944 100644
--- a/src/main/java/lol/hyper/toolstats/ToolStats.java
+++ b/src/main/java/lol/hyper/toolstats/ToolStats.java
@@ -186,7 +186,7 @@ public final class ToolStats extends JavaPlugin {
                 itemType = "trident";
             }
         } else {
-            itemType = itemName.substring(itemName.indexOf("_") + 1);
+            itemType = itemName.substring(itemName.indexOf('_') + 1);
         }
 
         if (itemType == null) {
diff --git a/src/main/java/lol/hyper/toolstats/events/BlocksMined.java b/src/main/java/lol/hyper/toolstats/events/BlocksMined.java
index 4aa4d38..c05d329 100644
--- a/src/main/java/lol/hyper/toolstats/events/BlocksMined.java
+++ b/src/main/java/lol/hyper/toolstats/events/BlocksMined.java
@@ -74,12 +74,10 @@ public class BlocksMined implements Listener {
         }
         // read the current stats from the item
         // if they don't exist, then start from 0
-        Integer blocksMined;
+        Integer blocksMined = 0;
         PersistentDataContainer container = meta.getPersistentDataContainer();
         if (container.has(toolStats.genericMined, PersistentDataType.INTEGER)) {
             blocksMined = container.get(toolStats.genericMined, PersistentDataType.INTEGER);
-        } else {
-            blocksMined = 0;
         }
 
         if (blocksMined == null) {
diff --git a/src/main/java/lol/hyper/toolstats/events/EntityDamage.java b/src/main/java/lol/hyper/toolstats/events/EntityDamage.java
index d6365eb..34f02e1 100644
--- a/src/main/java/lol/hyper/toolstats/events/EntityDamage.java
+++ b/src/main/java/lol/hyper/toolstats/events/EntityDamage.java
@@ -220,13 +220,12 @@ public class EntityDamage implements Listener {
             toolStats.logger.warning(itemStack + " does NOT have any meta! Unable to update stats.");
             return null;
         }
-        Integer playerKills;
+        Integer playerKills = 0;
         PersistentDataContainer container = meta.getPersistentDataContainer();
         if (container.has(toolStats.swordPlayerKills, PersistentDataType.INTEGER)) {
             playerKills = container.get(toolStats.swordPlayerKills, PersistentDataType.INTEGER);
-        } else {
-            playerKills = 0;
         }
+
         if (playerKills == null) {
             playerKills = 0;
             toolStats.logger.warning(itemStack + " does not have valid player-kills set! Resting to zero. This should NEVER happen.");
@@ -287,12 +286,10 @@ public class EntityDamage implements Listener {
             toolStats.logger.warning(itemStack + " does NOT have any meta! Unable to update stats.");
             return null;
         }
-        Integer mobKills;
+        Integer mobKills = 0;
         PersistentDataContainer container = meta.getPersistentDataContainer();
         if (container.has(toolStats.swordMobKills, PersistentDataType.INTEGER)) {
             mobKills = container.get(toolStats.swordMobKills, PersistentDataType.INTEGER);
-        } else {
-            mobKills = 0;
         }
 
         if (mobKills == null) {
@@ -354,12 +351,10 @@ public class EntityDamage implements Listener {
             toolStats.logger.warning(itemStack + " does NOT have any meta! Unable to update stats.");
             return;
         }
-        Double damageTaken;
+        Double damageTaken = 0.0;
         PersistentDataContainer container = meta.getPersistentDataContainer();
         if (container.has(toolStats.armorDamage, PersistentDataType.DOUBLE)) {
             damageTaken = container.get(toolStats.armorDamage, PersistentDataType.DOUBLE);
-        } else {
-            damageTaken = 0.0;
         }
 
         if (damageTaken == null) {
diff --git a/src/main/java/lol/hyper/toolstats/events/PlayerFish.java b/src/main/java/lol/hyper/toolstats/events/PlayerFish.java
index 7eaad95..8dc85c8 100644
--- a/src/main/java/lol/hyper/toolstats/events/PlayerFish.java
+++ b/src/main/java/lol/hyper/toolstats/events/PlayerFish.java
@@ -91,12 +91,10 @@ public class PlayerFish implements Listener {
             toolStats.logger.warning(fishingRod + " does NOT have any meta! Unable to update stats.");
             return;
         }
-        Integer fishCaught;
+        Integer fishCaught = 0;
         PersistentDataContainer container = meta.getPersistentDataContainer();
         if (container.has(toolStats.fishingRodCaught, PersistentDataType.INTEGER)) {
             fishCaught = container.get(toolStats.fishingRodCaught, PersistentDataType.INTEGER);
-        } else {
-            fishCaught = 0;
         }
 
         if (fishCaught == null) {
diff --git a/src/main/java/lol/hyper/toolstats/events/SheepShear.java b/src/main/java/lol/hyper/toolstats/events/SheepShear.java
index 689ae93..c30cdd3 100644
--- a/src/main/java/lol/hyper/toolstats/events/SheepShear.java
+++ b/src/main/java/lol/hyper/toolstats/events/SheepShear.java
@@ -86,12 +86,10 @@ public class SheepShear implements Listener {
             toolStats.logger.warning(newShears + " does NOT have any meta! Unable to update stats.");
             return null;
         }
-        Integer sheepSheared;
+        Integer sheepSheared = 0;
         PersistentDataContainer container = meta.getPersistentDataContainer();
         if (container.has(toolStats.shearsSheared, PersistentDataType.INTEGER)) {
             sheepSheared = container.get(toolStats.shearsSheared, PersistentDataType.INTEGER);
-        } else {
-            sheepSheared = 0;
         }
 
         if (sheepSheared == null) {