Upstream/Jobs
1
0
Fork 0
mirror of https://github.com/Zrips/Jobs.git synced 2024-11-25 20:16:13 +01:00
Code Issues Projects Releases Wiki Activity

Lets update boosts based by permission each time using info command

Browse Source
This commit is contained in:
Zrips 2018-11-12 13:10:14 +02:00
parent 9d8c9532c1
commit bd0f124031
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/gamingmesh/jobs/commands/JobsCommands.java
View File

@ -426,7 +426,7 @@ public class JobsCommands implements CommandExecutor {
public static String jobInfoMessage(JobsPlayer player, Job job, ActionType type) {
// money exp boost
Boost boost = Jobs.getPlayerManager().getFinalBonus(player, job);
Boost boost = Jobs.getPlayerManager().getFinalBonus(player, job, true);
StringBuilder message = new StringBuilder();

3
src/main/java/com/gamingmesh/jobs/config/GeneralConfigManager.java
View File

@ -938,8 +938,7 @@ public class GeneralConfigManager {
guiBackButton = tmat == null ? CMIMaterial.JACK_O_LANTERN.newItemStack() : tmat.newItemStack();
tmat = CMIMaterial.get(c.get("JobsGUI.Filler.Material", "STAINED_GLASS_PANE"));
Debug.D(c.get("JobsGUI.Filler.Material", "STAINED_GLASS_PANE"));
Debug.D( CMIMaterial.get(c.get("JobsGUI.Filler.Material", "STAINED_GLASS_PANE")));
guiFiller = tmat == null ? CMIMaterial.GREEN_STAINED_GLASS_PANE.newItemStack() : tmat.newItemStack();
ItemMeta meta = guiFiller.getItemMeta();
meta.setDisplayName(" ");

4
src/main/java/com/gamingmesh/jobs/container/JobsPlayer.java
View File

@ -34,6 +34,7 @@ import com.gamingmesh.jobs.dao.JobsDAO;
import com.gamingmesh.jobs.economy.PaymentData;
import com.gamingmesh.jobs.resources.jfep.Parser;
import com.gamingmesh.jobs.stuff.ChatColor;
import com.gamingmesh.jobs.stuff.Debug;
import com.gamingmesh.jobs.stuff.FurnaceBrewingHandling;
import com.gamingmesh.jobs.stuff.Perm;
import com.gamingmesh.jobs.stuff.TimeManage;
@ -242,7 +243,7 @@ public class JobsPlayer {
ArrayList<BoostCounter> counterList = new ArrayList<>();
counterList.add(new BoostCounter(type, Boost, time));
boostCounter.put(JobName, counterList);
return Boost;
}
@ -260,6 +261,7 @@ public class JobsPlayer {
v1 = Jobs.getPermissionManager().getMaxPermission(this, "jobs.boost.all." + type.getName().toLowerCase());
if (Boost == null || v1 != null && v1 > Boost)
Boost = v1;
Debug.D(Boost +" "+ JobName + " " + type);
return Boost == null ? 0D : Boost;
}