diff --git a/libs/CMILib1.4.0.0.jar b/libs/CMILib1.4.0.0.jar
deleted file mode 100644
index c11721ba..00000000
Binary files a/libs/CMILib1.4.0.0.jar and /dev/null differ
diff --git a/libs/CMILib1.4.3.1.jar b/libs/CMILib1.4.3.1.jar
new file mode 100644
index 00000000..0b2e2a62
Binary files /dev/null and b/libs/CMILib1.4.3.1.jar differ
diff --git a/pom.xml b/pom.xml
index 9fbe1035..51e4becf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -199,7 +199,7 @@
CMILib
latest
system
- ${basedir}/libs/CMILib1.4.0.0.jar
+ ${basedir}/libs/CMILib1.4.3.1.jar
diff --git a/src/main/java/com/gamingmesh/jobs/Jobs.java b/src/main/java/com/gamingmesh/jobs/Jobs.java
index 58215838..774e3c1e 100644
--- a/src/main/java/com/gamingmesh/jobs/Jobs.java
+++ b/src/main/java/com/gamingmesh/jobs/Jobs.java
@@ -1386,7 +1386,7 @@ public final class Jobs extends JavaPlugin {
public static void perform(JobsPlayer jPlayer, ActionInfo info, BufferedPayment payment, Job job, Block block, Entity ent, LivingEntity victim) {
double expPayment = payment.get(CurrencyType.EXP);
- JobsPrePaymentEvent jobsPrePaymentEvent = new JobsPrePaymentEvent(jPlayer.getPlayer(), noneJob, payment.get(CurrencyType.MONEY),
+ JobsPrePaymentEvent jobsPrePaymentEvent = new JobsPrePaymentEvent(jPlayer.getPlayer(), job, payment.get(CurrencyType.MONEY),
payment.get(CurrencyType.POINTS), block, ent, victim, info);
Bukkit.getServer().getPluginManager().callEvent(jobsPrePaymentEvent);
// If event is canceled, don't do anything
diff --git a/src/main/java/com/gamingmesh/jobs/commands/list/gtop.java b/src/main/java/com/gamingmesh/jobs/commands/list/gtop.java
index 5a70aa0d..f369b933 100644
--- a/src/main/java/com/gamingmesh/jobs/commands/list/gtop.java
+++ b/src/main/java/com/gamingmesh/jobs/commands/list/gtop.java
@@ -6,8 +6,11 @@ import com.gamingmesh.jobs.container.TopList;
import com.gamingmesh.jobs.i18n.Language;
import net.Zrips.CMILib.Container.PageInfo;
import net.Zrips.CMILib.Locale.LC;
+import net.Zrips.CMILib.Logs.CMIDebug;
import net.Zrips.CMILib.Messages.CMIMessages;
import net.Zrips.CMILib.Scoreboards.CMIScoreboard;
+import net.Zrips.CMILib.Version.Schedulers.CMIScheduler;
+
import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
@@ -52,14 +55,14 @@ public class gtop implements Cmd {
int amount = Jobs.getGCManager().JobsTopAmount;
PageInfo pi = new PageInfo(amount, Jobs.getPlayerManager().getPlayersCache().size(), page);
- Bukkit.getScheduler().runTaskAsynchronously(Jobs.getInstance(), () -> showGlobalTop(sender, pi, amount));
+ CMIScheduler.runTaskAsynchronously(() -> showGlobalTop(sender, pi, amount));
return true;
}
private static void showGlobalTop(CommandSender sender, PageInfo pi, int amount) {
Player player = (Player) sender;
List FullList = Jobs.getJobsDAO().getGlobalTopList(pi.getStart())
- .stream().filter(gtop::hasToBeSeenInGlobalTop).collect(Collectors.toList());
+ .stream().filter(gtop::hasToBeSeenInGlobalTop).collect(Collectors.toList());
if (FullList.isEmpty()) {
Language.sendMessage(sender, "command.gtop.error.nojob");
return;
@@ -74,11 +77,11 @@ public class gtop implements Cmd {
break;
Language.sendMessage(sender, "command.gtop.output.list",
- "%number%", pi.getPositionForOutput(i),
- "%playername%", One.getPlayerInfo().getName(),
- "%playerdisplayname%", One.getPlayerInfo().getDisplayName(),
- "%level%", One.getLevel(),
- "%exp%", One.getExp());
+ "%number%", pi.getPositionForOutput(i),
+ "%playername%", One.getPlayerInfo().getName(),
+ "%playerdisplayname%", One.getPlayerInfo().getDisplayName(),
+ "%level%", One.getLevel(),
+ "%exp%", One.getExp());
++i;
}
} else {
@@ -89,13 +92,13 @@ public class gtop implements Cmd {
break;
ls.add(Jobs.getLanguage().getMessage("scoreboard.line",
- "%number%", pi.getPositionForOutput(i),
- "%playername%", one.getPlayerInfo().getName(),
- "%playerdisplayname%", one.getPlayerInfo().getDisplayName(),
- "%level%", one.getLevel()));
+ "%number%", pi.getPositionForOutput(i),
+ "%playername%", one.getPlayerInfo().getName(),
+ "%playerdisplayname%", one.getPlayerInfo().getDisplayName(),
+ "%level%", one.getLevel()));
++i;
}
-
+
CMIScoreboard.show(player, Jobs.getLanguage().getMessage("scoreboard.gtopline"), ls, Jobs.getGCManager().ToplistInScoreboardInterval);
}
@@ -105,11 +108,10 @@ public class gtop implements Cmd {
private static boolean hasToBeSeenInGlobalTop(TopList topList) {
Player player = topList.getPlayerInfo().getJobsPlayer().getPlayer();
if (player != null)
- return !player.hasPermission("jobs.hidegtop");
+ return !player.isPermissionSet("jobs.hidegtop");
return !Jobs.getVaultPermission().playerHas(
- null,
- Bukkit.getOfflinePlayer(topList.getPlayerInfo().getUuid()),
- "jobs.hidegtop"
- );
+ null,
+ Bukkit.getOfflinePlayer(topList.getPlayerInfo().getUuid()),
+ "jobs.hidegtop");
}
}
diff --git a/src/main/java/com/gamingmesh/jobs/commands/list/top.java b/src/main/java/com/gamingmesh/jobs/commands/list/top.java
index d2f7abcd..1cc250d2 100644
--- a/src/main/java/com/gamingmesh/jobs/commands/list/top.java
+++ b/src/main/java/com/gamingmesh/jobs/commands/list/top.java
@@ -9,6 +9,8 @@ import net.Zrips.CMILib.Container.PageInfo;
import net.Zrips.CMILib.Locale.LC;
import net.Zrips.CMILib.Messages.CMIMessages;
import net.Zrips.CMILib.Scoreboards.CMIScoreboard;
+import net.Zrips.CMILib.Version.Schedulers.CMIScheduler;
+
import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;
import org.bukkit.command.CommandSender;
@@ -58,14 +60,14 @@ public class top implements Cmd {
int workingIn = Jobs.getUsedSlots(job);
PageInfo pi = new PageInfo(Jobs.getGCManager().JobsTopAmount, workingIn, page);
final int finalPage = page;
- Bukkit.getScheduler().runTaskAsynchronously(Jobs.getInstance(), () ->showTop(sender, job, pi, finalPage) );
+ CMIScheduler.runTaskAsynchronously(() -> showTop(sender, job, pi, finalPage));
return true;
}
private static void showTop(CommandSender sender, Job job, PageInfo pi, int page) {
Player player = (Player) sender;
List fullList = Jobs.getJobsDAO().toplist(job.getName(), pi.getStart())
- .stream().filter(topList -> hasToBeSeenInTop(topList, job)).collect(Collectors.toList());
+ .stream().filter(topList -> hasToBeSeenInTop(topList, job)).collect(Collectors.toList());
if (fullList.isEmpty()) {
CMIMessages.sendMessage(sender, LC.info_NoInformation);
@@ -83,11 +85,11 @@ public class top implements Cmd {
break;
Language.sendMessage(sender, "command.top.output.list",
- "%number%", ((page - 1) * Jobs.getGCManager().JobsTopAmount) + place,
- "%playername%", one.getPlayerInfo().getName(),
- "%playerdisplayname%", one.getPlayerInfo().getDisplayName(),
- "%level%", one.getLevel(),
- "%exp%", one.getExp());
+ "%number%", ((page - 1) * Jobs.getGCManager().JobsTopAmount) + place,
+ "%playername%", one.getPlayerInfo().getName(),
+ "%playerdisplayname%", one.getPlayerInfo().getDisplayName(),
+ "%level%", one.getLevel(),
+ "%exp%", one.getExp());
place++;
}
pi.autoPagination(sender, "jobs top " + job.getName());
@@ -98,7 +100,7 @@ public class top implements Cmd {
if (place > Jobs.getGCManager().JobsTopAmount)
break;
ls.add(Jobs.getLanguage().getMessage("scoreboard.line", "%number%", ((page - 1) * Jobs.getGCManager().JobsTopAmount) + place,
- "%playername%", one.getPlayerInfo().getName(), "%playerdisplayname%", one.getPlayerInfo().getDisplayName(), "%level%", one.getLevel()));
+ "%playername%", one.getPlayerInfo().getName(), "%playerdisplayname%", one.getPlayerInfo().getDisplayName(), "%level%", one.getLevel()));
place++;
}
@@ -111,11 +113,11 @@ public class top implements Cmd {
private static boolean hasToBeSeenInTop(TopList topList, Job job) {
Player player = topList.getPlayerInfo().getJobsPlayer().getPlayer();
if (player != null)
- return !player.hasPermission("jobs.hidetop.*") || !player.hasPermission("jobs.hidetop." + job.getName().toLowerCase());
+ return !player.isPermissionSet("jobs.hidetop.*") || !player.isPermissionSet("jobs.hidetop." + job.getName().toLowerCase());
+
OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(topList.getPlayerInfo().getUuid());
- return !
- (Jobs.getVaultPermission().playerHas(null, offlinePlayer, "jobs.hidetop.*")
- || Jobs.getVaultPermission().playerHas(null, offlinePlayer, "jobs.hidetop." + job.getName().toLowerCase()));
+ return !(Jobs.getVaultPermission().playerHas(null, offlinePlayer, "jobs.hidetop.*")
+ || Jobs.getVaultPermission().playerHas(null, offlinePlayer, "jobs.hidetop." + job.getName().toLowerCase()));
}
}