From b0aaeb346e8c34748dd3523e13547373eb62b2b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yi=C4=9Fit=20Duman?= Date: Sat, 14 Sep 2019 17:08:51 +0300 Subject: [PATCH] Get the job original name from config instead of section name (#537) --- .../com/gamingmesh/jobs/container/Job.java | 29 +++++++------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/gamingmesh/jobs/container/Job.java b/src/main/java/com/gamingmesh/jobs/container/Job.java index 32276ecb..c3a1e64d 100644 --- a/src/main/java/com/gamingmesh/jobs/container/Job.java +++ b/src/main/java/com/gamingmesh/jobs/container/Job.java @@ -18,21 +18,14 @@ package com.gamingmesh.jobs.container; -import java.util.ArrayList; -import java.util.Collections; -import java.util.EnumMap; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Random; - +import com.gamingmesh.jobs.Jobs; +import com.gamingmesh.jobs.resources.jfep.Parser; +import com.gamingmesh.jobs.stuff.ChatColor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; -import com.gamingmesh.jobs.Jobs; -import com.gamingmesh.jobs.resources.jfep.Parser; -import com.gamingmesh.jobs.stuff.ChatColor; +import java.util.*; public class Job { @@ -227,15 +220,15 @@ public class Job { * @return the job name */ public String getName() { - return jobName; + return fullName; } /** - * Get the job full name - * @return the job full name + * Get the job name from the config + * @return the job name from the config */ - public String getFullName() { - return fullName; + public String getJobKeyName() { + return jobName; } /** @@ -275,8 +268,8 @@ public class Job { * @param level - current level * @return the correct max exp for this level */ - public double getMaxExp(Map param) { - for (Map.Entry temp : param.entrySet()) { + public double getMaxExp(Map level) { + for (Map.Entry temp : level.entrySet()) { maxExpEquation.setVariable(temp.getKey(), temp.getValue()); } return maxExpEquation.getValue();