Adding Owner placeholder to commands upgrades

BentoBoxWorld · Sep 25, 2020 · e9fb64f · e9fb64f
1 parent 96f0dc5
commit e9fb64f
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/src/main/java/world/bentobox/upgrades/UpgradesManager.java b/src/main/java/world/bentobox/upgrades/UpgradesManager.java
@@ -417,12 +417,12 @@ public int getCommandUpgradeMax(String cmd, World world) {
 		return this.addon.getSettings().getMaxCommandUpgrade(cmd, name);
 	}
 
-	public List<String> getCommandList(String cmd, int cmdLevel, World world, String playerName) {
-		Settings.CommandUpgradeTier cmdUpgradeTier = this.getCommandUpgradeTier(cmd, cmdLevel, world);
+	public List<String> getCommandList(String cmd, int cmdLevel, Island island, String playerName) {
+		Settings.CommandUpgradeTier cmdUpgradeTier = this.getCommandUpgradeTier(cmd, cmdLevel, island.getWorld());
 
 		if (cmdUpgradeTier == null)
 			return Collections.emptyList();
-		return cmdUpgradeTier.getCommandList(playerName, cmdLevel);
+		return cmdUpgradeTier.getCommandList(playerName, island, cmdLevel);
 	}
 
 	public Boolean isCommantConsole(String cmd, int cmdLevel, World world) {

diff --git a/src/main/java/world/bentobox/upgrades/config/Settings.java b/src/main/java/world/bentobox/upgrades/config/Settings.java
@@ -16,6 +16,7 @@
 import org.bukkit.entity.EntityType;
 import org.eclipse.jdt.annotation.NonNull;
 
+import world.bentobox.bentobox.database.objects.Island;
 import world.bentobox.upgrades.UpgradesAddon;
 
 public class Settings {
@@ -646,12 +647,14 @@ public void setCommandList(List<String> commandsList) {
 			this.commandList = commandsList;
 		}
 
-		public List<String> getCommandList(String playerName, int level) {
+		public List<String> getCommandList(String playerName, Island island, int level) {
 			List<String> formatedList = new ArrayList<String>(this.commandList.size());
+			String owner = island.getPlugin().getPlayers().getName(island.getOwner());
 
 			this.commandList.forEach(cmd -> {
 				String fcmd = cmd.replace("[player]", playerName)
-						.replace("[level]", Integer.toString(level));
+						.replace("[level]", Integer.toString(level))
+						.replace("[owner]", owner);
 				formatedList.add(fcmd);
 			});
 			return formatedList;

diff --git a/src/main/java/world/bentobox/upgrades/upgrades/CommandUpgrade.java b/src/main/java/world/bentobox/upgrades/upgrades/CommandUpgrade.java
@@ -103,7 +103,7 @@ public boolean doUpgrade(User user, Island island) {
 		if (!super.doUpgrade(user, island))
 			return false;
 
-		List<String> commands = upgradeAddon.getUpgradesManager().getCommandList(this.cmdId, upgradeLevel, island.getWorld(), user.getName());
+		List<String> commands = upgradeAddon.getUpgradesManager().getCommandList(this.cmdId, upgradeLevel, island, user.getName());
 		Boolean isConsole = upgradeAddon.getUpgradesManager().isCommantConsole(this.cmdId, upgradeLevel, island.getWorld());
 
 		commands.forEach(cmd -> {

diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
@@ -74,6 +74,7 @@ entity-limits-upgrade:
 # For the command section:
 #     [player] : is the name of the player
 #     [level] : is the level of the upgrade
+#     [owner] : is the name of the island's owner
 # Permission upgrade name: command-[NAME]       -> In lower case + NAME != name:
 command-upgrade:
   lambda-upgrade: