fix deepsource problems

This commit is contained in:
hyperdefined
2022-10-13 18:09:19 -04:00
parent bea7e52347
commit 24d30f6059
5 changed files with 8 additions and 19 deletions

View File

@@ -186,7 +186,7 @@ public final class ToolStats extends JavaPlugin {
itemType = "trident"; itemType = "trident";
} }
} else { } else {
itemType = itemName.substring(itemName.indexOf("_") + 1); itemType = itemName.substring(itemName.indexOf('_') + 1);
} }
if (itemType == null) { if (itemType == null) {

View File

@@ -74,12 +74,10 @@ public class BlocksMined implements Listener {
} }
// read the current stats from the item // read the current stats from the item
// if they don't exist, then start from 0 // if they don't exist, then start from 0
Integer blocksMined; Integer blocksMined = 0;
PersistentDataContainer container = meta.getPersistentDataContainer(); PersistentDataContainer container = meta.getPersistentDataContainer();
if (container.has(toolStats.genericMined, PersistentDataType.INTEGER)) { if (container.has(toolStats.genericMined, PersistentDataType.INTEGER)) {
blocksMined = container.get(toolStats.genericMined, PersistentDataType.INTEGER); blocksMined = container.get(toolStats.genericMined, PersistentDataType.INTEGER);
} else {
blocksMined = 0;
} }
if (blocksMined == null) { if (blocksMined == null) {

View File

@@ -220,13 +220,12 @@ public class EntityDamage implements Listener {
toolStats.logger.warning(itemStack + " does NOT have any meta! Unable to update stats."); toolStats.logger.warning(itemStack + " does NOT have any meta! Unable to update stats.");
return null; return null;
} }
Integer playerKills; Integer playerKills = 0;
PersistentDataContainer container = meta.getPersistentDataContainer(); PersistentDataContainer container = meta.getPersistentDataContainer();
if (container.has(toolStats.swordPlayerKills, PersistentDataType.INTEGER)) { if (container.has(toolStats.swordPlayerKills, PersistentDataType.INTEGER)) {
playerKills = container.get(toolStats.swordPlayerKills, PersistentDataType.INTEGER); playerKills = container.get(toolStats.swordPlayerKills, PersistentDataType.INTEGER);
} else {
playerKills = 0;
} }
if (playerKills == null) { if (playerKills == null) {
playerKills = 0; playerKills = 0;
toolStats.logger.warning(itemStack + " does not have valid player-kills set! Resting to zero. This should NEVER happen."); 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."); toolStats.logger.warning(itemStack + " does NOT have any meta! Unable to update stats.");
return null; return null;
} }
Integer mobKills; Integer mobKills = 0;
PersistentDataContainer container = meta.getPersistentDataContainer(); PersistentDataContainer container = meta.getPersistentDataContainer();
if (container.has(toolStats.swordMobKills, PersistentDataType.INTEGER)) { if (container.has(toolStats.swordMobKills, PersistentDataType.INTEGER)) {
mobKills = container.get(toolStats.swordMobKills, PersistentDataType.INTEGER); mobKills = container.get(toolStats.swordMobKills, PersistentDataType.INTEGER);
} else {
mobKills = 0;
} }
if (mobKills == null) { 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."); toolStats.logger.warning(itemStack + " does NOT have any meta! Unable to update stats.");
return; return;
} }
Double damageTaken; Double damageTaken = 0.0;
PersistentDataContainer container = meta.getPersistentDataContainer(); PersistentDataContainer container = meta.getPersistentDataContainer();
if (container.has(toolStats.armorDamage, PersistentDataType.DOUBLE)) { if (container.has(toolStats.armorDamage, PersistentDataType.DOUBLE)) {
damageTaken = container.get(toolStats.armorDamage, PersistentDataType.DOUBLE); damageTaken = container.get(toolStats.armorDamage, PersistentDataType.DOUBLE);
} else {
damageTaken = 0.0;
} }
if (damageTaken == null) { if (damageTaken == null) {

View File

@@ -91,12 +91,10 @@ public class PlayerFish implements Listener {
toolStats.logger.warning(fishingRod + " does NOT have any meta! Unable to update stats."); toolStats.logger.warning(fishingRod + " does NOT have any meta! Unable to update stats.");
return; return;
} }
Integer fishCaught; Integer fishCaught = 0;
PersistentDataContainer container = meta.getPersistentDataContainer(); PersistentDataContainer container = meta.getPersistentDataContainer();
if (container.has(toolStats.fishingRodCaught, PersistentDataType.INTEGER)) { if (container.has(toolStats.fishingRodCaught, PersistentDataType.INTEGER)) {
fishCaught = container.get(toolStats.fishingRodCaught, PersistentDataType.INTEGER); fishCaught = container.get(toolStats.fishingRodCaught, PersistentDataType.INTEGER);
} else {
fishCaught = 0;
} }
if (fishCaught == null) { if (fishCaught == null) {

View File

@@ -86,12 +86,10 @@ public class SheepShear implements Listener {
toolStats.logger.warning(newShears + " does NOT have any meta! Unable to update stats."); toolStats.logger.warning(newShears + " does NOT have any meta! Unable to update stats.");
return null; return null;
} }
Integer sheepSheared; Integer sheepSheared = 0;
PersistentDataContainer container = meta.getPersistentDataContainer(); PersistentDataContainer container = meta.getPersistentDataContainer();
if (container.has(toolStats.shearsSheared, PersistentDataType.INTEGER)) { if (container.has(toolStats.shearsSheared, PersistentDataType.INTEGER)) {
sheepSheared = container.get(toolStats.shearsSheared, PersistentDataType.INTEGER); sheepSheared = container.get(toolStats.shearsSheared, PersistentDataType.INTEGER);
} else {
sheepSheared = 0;
} }
if (sheepSheared == null) { if (sheepSheared == null) {