extra variable as -cmd for promote commands

src/main/java/com/gamingmesh/jobs/PlayerManager.java

@@ -544,7 +544,25 @@ public class PlayerManager {
      * @param levels - number of levels to promote
      */
     public void promoteJob(JobsPlayer jPlayer, Job job, int levels) {
+	promoteJob(jPlayer, job, levels, false);
+    }
+
+    /**
+     * Promotes player in their job
+     *
+     * @param jPlayer {@link JobsPlayer}
+     * @param job - the job
+     * @param levels - number of levels to promote
+     */
+    public void promoteJob(JobsPlayer jPlayer, Job job, int levels, boolean performCommands) {
+
+	if (performCommands) {
+	    JobProgression prog = jPlayer.getJobProgression(job);
+	    performCommandOnLevelUp(jPlayer, prog, prog.getLevel(), prog.getLevel() + levels);
+	}
+
 	jPlayer.promoteJob(job, levels);
+
 	jPlayer.save();
 
 	Jobs.getSignUtil().updateAllSign(job);
@@ -628,7 +646,7 @@ public class PlayerManager {
 	if (prog.getLevel() < oldLevel) {
 	    String message = Jobs.getLanguage().getMessage("message.leveldown.message");
 
-	    message = message.replace("%jobname%", job.getJobDisplayName());
+	    message = message.replace("%jobname%", job.getDisplayName());
 	    message = message.replace("%playername%", player != null ? plugin.getComplement().getDisplayName(player) : jPlayer.getName());
 	    message = message.replace("%joblevel%", prog.getLevelFormatted());
 	    message = message.replace("%lostLevel%", Integer.toString(oldLevel));
@@ -731,7 +749,7 @@ public class PlayerManager {
 	String message = Jobs.getLanguage().getMessage("message.levelup." + (Jobs.getGCManager().isBroadcastingLevelups()
 	    ? "broadcast" : "nobroadcast"));
 
-	message = message.replace("%jobname%", job.getJobDisplayName());
+	message = message.replace("%jobname%", job.getDisplayName());
 
 	if (levelUpEvent.getOldTitle() != null)
 	    message = message.replace("%titlename%", levelUpEvent.getOldTitle()
@@ -772,7 +790,7 @@ public class PlayerManager {
 	    message = message.replace("%playername%", player != null ? plugin.getComplement().getDisplayName(player) : jPlayer.getName());
 	    message = message.replace("%titlename%", levelUpEvent.getNewTitle()
 		.getChatColor().toString() + levelUpEvent.getNewTitle().getName());
-	    message = message.replace("%jobname%", job.getJobDisplayName());
+	    message = message.replace("%jobname%", job.getDisplayName());
 
 	    if (Jobs.getGCManager().isBroadcastingSkillups() || Jobs.getGCManager().TitleChangeActionBar || Jobs.getGCManager().TitleChangeChat) {
 		for (String line : message.split("\n")) {
@@ -831,23 +849,40 @@ public class PlayerManager {
      */
     public void performCommandOnLevelUp(JobsPlayer jPlayer, JobProgression prog, int oldLevel) {
 	int newLevel = oldLevel + 1;
-	Player player = plugin.getServer().getPlayer(jPlayer.getUniqueId());
+	List<String> commands = getCommandsOnLevelUp(jPlayer, prog, newLevel);
+	commands.stream().forEach(cmd -> plugin.getServer().dispatchCommand(plugin.getServer().getConsoleSender(), cmd));
+    }
 
+    private static List<String> getCommandsOnLevelUp(JobsPlayer jPlayer, JobProgression prog, int newLevel) {
+	List<String> commands = new ArrayList<String>();
 	for (JobCommands command : prog.getJob().getCommands()) {
-	    if ((command.getLevelFrom() == 0 && command.getLevelUntil() == 0) || (newLevel >= command.getLevelFrom()
+	    if ((command.getLevelFrom() == 0 && command.getLevelUntil() == 0) || (newLevel >= command.getLevelFrom() && newLevel <= command.getLevelUntil())) {
-		&& newLevel <= command.getLevelUntil())) {
 		for (String commandString : new ArrayList<>(command.getCommands())) {
-		    if (player != null)
+		    commandString = commandString.replace("[player]", jPlayer.getName())
-			commandString = commandString.replace("[player]", player.getName());
+			.replace("[oldlevel]", Integer.toString(newLevel - 1))
-
+			.replace("[newlevel]", Integer.toString(newLevel))
-		    commandString = commandString.replace("[oldlevel]", Integer.toString(oldLevel));
+			.replace("[jobname]", prog.getJob().getName());
-		    commandString = commandString.replace("[newlevel]", Integer.toString(newLevel));
+		    commands.add(commandString);
-		    commandString = commandString.replace("[jobname]", prog.getJob().getName());
-
-		    plugin.getServer().dispatchCommand(plugin.getServer().getConsoleSender(), commandString);
 		}
 	    }
 	}
+	return commands;
+    }
+
+    /**
+     * Performs command for each level
+     *
+     * @param jPlayer {@link JobsPlayer}
+     * @param job {@link Job}
+     * @param oldLevel
+     */
+    public void performCommandOnLevelUp(JobsPlayer jPlayer, JobProgression prog, int oldLevel, int untilLevel) {
+	if (oldLevel > untilLevel)
+	    return;
+	for (int newLevel = oldLevel + 1; newLevel <= untilLevel; newLevel++) {
+	    List<String> commands = getCommandsOnLevelUp(jPlayer, prog, newLevel);
+	    commands.stream().forEach(cmd -> plugin.getServer().dispatchCommand(plugin.getServer().getConsoleSender(), cmd));
+	}
     }
 
     /**

src/main/java/com/gamingmesh/jobs/commands/list/promote.java

@@ -28,17 +28,29 @@ public class promote implements Cmd {
 	    sender.sendMessage(Jobs.getLanguage().getMessage("general.error.job"));
 	    return true;
 	}
-	try {
+
 	// check if player already has the job
-	    if (jPlayer.isInJob(job)) {
+	if (!jPlayer.isInJob(job))
+	    return false;
+
+	try {
+
 	    int levelsGained = -1;
 	    try {
 		levelsGained = Integer.parseInt(args[2]);
 	    } catch (NumberFormatException ex) {
-		    return true;
+		return false;
 	    }
 
-		Jobs.getPlayerManager().promoteJob(jPlayer, job, levelsGained);
+	    boolean commands = false;
+	    for (String one : args) {
+		if (one.equalsIgnoreCase("-cmd")) {
+		    commands = true;
+		    continue;
+		}
+	    }
+
+	    Jobs.getPlayerManager().promoteJob(jPlayer, job, levelsGained, commands);
 
 	    Player player = jPlayer.getPlayer();
 	    if (player != null)
@@ -47,7 +59,7 @@ public class promote implements Cmd {
 		    "%levelsgained%", levelsGained));
 
 	    sender.sendMessage(Jobs.getLanguage().getMessage("general.admin.success"));
-	    }
+
 	} catch (Throwable e) {
 	    sender.sendMessage(Jobs.getLanguage().getMessage("general.admin.error"));
 	}

src/main/java/com/gamingmesh/jobs/config/LanguageManager.java

@@ -589,8 +589,8 @@ public class LanguageManager {
 	    c.get("command.transfer.output.target", "You have been transferred from %oldjobname% to %newjobname%.");
 
 	    c.get("command.promote.help.info", "Promote the player X levels in a job.");
-	    c.get("command.promote.help.args", "[playername] [jobname] [levels]");
+	    c.get("command.promote.help.args", "[playername] [jobname] [levels] (-cmd)");
-	    Jobs.getGCManager().getCommandArgs().put("promote", Arrays.asList("[playername]", "[jobname]", "[levels]"));
+	    Jobs.getGCManager().getCommandArgs().put("promote", Arrays.asList("[playername]", "[jobname]", "[levels]", "%%-cmd"));
 	    c.get("command.promote.output.target", "You have been promoted %levelsgained% levels in %jobname%.");
 
 	    c.get("command.exp.help.info", "Change the player exp for job.");