Changing function used to get Island #2

Adding some more check to stop error
BentoBoxWorld · May 28, 2020 · 82977d9 · 82977d9
1 parent 66e09b2
commit 82977d9
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 9 deletions.
diff --git a/src/main/java/world/bentobox/upgrades/UpgradesManager.java b/src/main/java/world/bentobox/upgrades/UpgradesManager.java
@@ -41,6 +41,11 @@ public int getIslandLevel(Island island) {
 		if (!this.addon.isLevelProvided())
 			return 0;
 
+		if (island == null) {
+			this.addon.logError("Island couldn't be found");
+			return 0;
+		}
+
 		return (int) this.addon.getLevelAddon().getIslandLevel(island.getWorld(), island.getOwner());
 	}
 

diff --git a/src/main/java/world/bentobox/upgrades/command/PlayerUpgradeCommand.java b/src/main/java/world/bentobox/upgrades/command/PlayerUpgradeCommand.java
@@ -23,7 +23,7 @@ public void setup() {
 
 	@Override
 	public boolean canExecute(User user, String label, List<String> args) {
-		boolean hasIsland = getIslands().getIsland(getWorld(), user) != null;
+		boolean hasIsland = getIslands().getIsland(user.getWorld(), user) != null;
 
 		if (!hasIsland)
 			user.sendMessage("general.errors.no-island");
@@ -33,7 +33,7 @@ public boolean canExecute(User user, String label, List<String> args) {
 	@Override
 	public boolean execute(User user, String label, List<String> args) {
 		if (args.size() == 0) {
-			if (getIslands().getIsland(getWorld(), user) == null) {
+			if (getIslands().getIsland(user.getWorld(), user) == null) {
 				user.sendMessage("general.errors.no-island");
 				return false;
 			}

diff --git a/src/main/java/world/bentobox/upgrades/ui/Panel.java b/src/main/java/world/bentobox/upgrades/ui/Panel.java
@@ -43,15 +43,19 @@ private List<String> getDescription(User user, Upgrade upgrade, int islandLevel)
 			descrip.add(user.getTranslation("upgrades.ui.upgradepanel.maxlevel"));
 		else {
 			boolean hasMoney = this.addon.getVaultHook().has(user, upgrade.getUpgradeValues().getMoneyCost());
-			descrip.add((upgrade.getUpgradeValues().getIslandLevel() <= islandLevel ? "§a" : "§c") + 
-				user.getTranslation("upgrades.ui.upgradepanel.islandneed",
-					"[islandlevel]", Integer.toString(upgrade.getUpgradeValues().getIslandLevel())));
+			if (this.addon.isLevelProvided()) {
+				descrip.add((upgrade.getUpgradeValues().getIslandLevel() <= islandLevel ? "§a" : "§c") + 
+					user.getTranslation("upgrades.ui.upgradepanel.islandneed",
+						"[islandlevel]", Integer.toString(upgrade.getUpgradeValues().getIslandLevel())));
+			}
 
-			descrip.add((hasMoney ? "§a" : "§c") + 
-				user.getTranslation("upgrades.ui.upgradepanel.moneycost",
-					"[cost]", Integer.toString(upgrade.getUpgradeValues().getMoneyCost())));
+			if (this.addon.isVaultProvided()) {
+				descrip.add((hasMoney ? "§a" : "§c") + 
+					user.getTranslation("upgrades.ui.upgradepanel.moneycost",
+						"[cost]", Integer.toString(upgrade.getUpgradeValues().getMoneyCost())));
+			}
 
-			if (upgrade.getUpgradeValues().getIslandLevel() > islandLevel) {
+			if (this.addon.isLevelProvided() && upgrade.getUpgradeValues().getIslandLevel() > islandLevel) {
 				descrip.add("§8" + user.getTranslation("upgrades.ui.upgradepanel.tryreloadlevel"));
 			}
 		}