Fix #11 Setting default island level to 0 when level is -

BentoBoxWorld · Jul 6, 2020 · 855eb88 · 855eb88
1 parent c697766
commit 855eb88
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/main/java/world/bentobox/upgrades/UpgradesManager.java b/src/main/java/world/bentobox/upgrades/UpgradesManager.java
@@ -46,7 +46,14 @@ public int getIslandLevel(Island island) {
 			return 0;
 		}
 
-		return (int) this.addon.getLevelAddon().getIslandLevel(island.getWorld(), island.getOwner());
+		int islandLevel = (int) this.addon.getLevelAddon().getIslandLevel(island.getWorld(), island.getOwner());
+
+		if (islandLevel < 0) {
+			this.addon.logWarning("Island " + island.getUniqueId() + " has an invalid level: " + islandLevel);
+			islandLevel = 0;
+		}
+
+		return islandLevel;
 	}
 
 	public List<Settings.UpgradeTier> getAllRangeUpgradeTiers(World world) {

diff --git a/src/main/java/world/bentobox/upgrades/upgrades/BlockLimitsUpgrade.java b/src/main/java/world/bentobox/upgrades/upgrades/BlockLimitsUpgrade.java
@@ -29,12 +29,7 @@ public void updateUpgradeValue(User user, Island island) {
 		UpgradesData islandData = upgradeAddon.getUpgradesLevels(island.getUniqueId());
 		int upgradeLevel = islandData.getUpgradeLevel(getName());
 		int numberPeople = island.getMemberSet().size();
-		int islandLevel;
-
-		if (upgradeAddon.isLevelProvided())
-			islandLevel = upgradeAddon.getUpgradesManager().getIslandLevel(island);
-		else
-			islandLevel = 0;
+		int islandLevel = upgradeAddon.getUpgradesManager().getIslandLevel(island);
 
 		Map<String, Integer> upgradeInfos = upgradeAddon.getUpgradesManager().getBlockLimitsUpgradeInfos(this.block, upgradeLevel, islandLevel, numberPeople, island.getWorld());
 		UpgradeValues upgrade;