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

Update Jobs.java

Browse Source
This commit is contained in:
montlikadani 2018-08-16 17:43:10 +02:00 committed by GitHub
parent e6b32bace2
commit f2c5a916d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/com/gamingmesh/jobs/Jobs.java
View File

@ -106,7 +106,6 @@ import com.gamingmesh.jobs.tasks.BufferedPaymentThread;
import com.gamingmesh.jobs.tasks.DatabaseSaveThread; import com.gamingmesh.jobs.tasks.DatabaseSaveThread;
public class Jobs extends JavaPlugin { public class Jobs extends JavaPlugin {
// public static Jobs plugin = new Jobs();
private static String version = ""; private static String version = "";
private static PlayerManager pManager = null; private static PlayerManager pManager = null;
private static JobsCommands cManager = null; private static JobsCommands cManager = null;
@ -146,9 +145,9 @@ public class Jobs extends JavaPlugin {
private static JobsDAO dao = null; private static JobsDAO dao = null;
private static List<Job> jobs = null; private static List<Job> jobs = null;
private static Job noneJob = null; private static Job noneJob = null;
private static WeakHashMap<Job, Integer> usedSlots = new WeakHashMap<Job, Integer>(); private static WeakHashMap<Job, Integer> usedSlots = new WeakHashMap<>();
public static WeakHashMap<String, Boolean> actionbartoggle = new WeakHashMap<String, Boolean>(); public static WeakHashMap<String, Boolean> actionbartoggle = new WeakHashMap<>();
public static WeakHashMap<String, Boolean> BossBartoggle = new WeakHashMap<String, Boolean>(); public static WeakHashMap<String, Boolean> BossBartoggle = new WeakHashMap<>();
// public static WeakHashMap<String, Double> GlobalBoost = new WeakHashMap<String, Double>(); // public static WeakHashMap<String, Double> GlobalBoost = new WeakHashMap<String, Double>();
private static BufferedEconomy economy; private static BufferedEconomy economy;
private static PermissionHandler permissionHandler; private static PermissionHandler permissionHandler;
@ -159,7 +158,7 @@ public class Jobs extends JavaPlugin {
public static BufferedPaymentThread paymentThread = null; public static BufferedPaymentThread paymentThread = null;
private static DatabaseSaveThread saveTask = null; private static DatabaseSaveThread saveTask = null;
public static HashMap<String, FastPayment> FastPayment = new HashMap<String, FastPayment>(); public static HashMap<String, FastPayment> FastPayment = new HashMap<>();
private static NMS nms; private static NMS nms;
@ -552,7 +551,7 @@ public class Jobs extends JavaPlugin {
public static void loadAllPlayersData() { public static void loadAllPlayersData() {
long time = System.currentTimeMillis(); long time = System.currentTimeMillis();
// Cloning to avoid issues // Cloning to avoid issues
HashMap<UUID, PlayerInfo> temp = new HashMap<UUID, PlayerInfo>(Jobs.getPlayerManager().getPlayersInfoUUIDMap()); HashMap<UUID, PlayerInfo> temp = new HashMap<>(Jobs.getPlayerManager().getPlayersInfoUUIDMap());
HashMap<Integer, List<JobsDAOData>> playersJobs = Jobs.getJobsDAO().getAllJobs(); HashMap<Integer, List<JobsDAOData>> playersJobs = Jobs.getJobsDAO().getAllJobs();
HashMap<Integer, PlayerPoints> playersPoints = Jobs.getJobsDAO().getAllPoints(); HashMap<Integer, PlayerPoints> playersPoints = Jobs.getJobsDAO().getAllPoints();
HashMap<Integer, HashMap<String, Log>> playersLogs = Jobs.getJobsDAO().getAllLogs(); HashMap<Integer, HashMap<String, Log>> playersLogs = Jobs.getJobsDAO().getAllLogs();
@ -846,8 +845,7 @@ public class Jobs extends JavaPlugin {
FurnaceBrewingHandling.load(); FurnaceBrewingHandling.load();
String message = ChatColor.translateAlternateColorCodes('&', "&e[Jobs] Plugin has been enabled succesfully."); String message = ChatColor.translateAlternateColorCodes('&', "&e[Jobs] Plugin has been enabled succesfully.");
ConsoleCommandSender console = Bukkit.getServer().getConsoleSender(); Bukkit.getServer().getConsoleSender().sendMessage(message);
console.sendMessage(message);
lManager.reload(); lManager.reload();
cManager.fillCommands(); cManager.fillCommands();
@ -870,8 +868,7 @@ public class Jobs extends JavaPlugin {
Jobs.shutdown(); Jobs.shutdown();
String message = ChatColor.translateAlternateColorCodes('&', "&e[Jobs] &2Plugin has been disabled succesfully."); String message = ChatColor.translateAlternateColorCodes('&', "&e[Jobs] &2Plugin has been disabled succesfully.");
ConsoleCommandSender console = Bukkit.getServer().getConsoleSender(); Bukkit.getServer().getConsoleSender().sendMessage(message);
console.sendMessage(message);
this.setEnabled(false); this.setEnabled(false);
} }
@ -995,7 +992,7 @@ public class Jobs extends JavaPlugin {
Jobs.getEconomy().pay(jPlayer, income, pointAmount, 0.0); Jobs.getEconomy().pay(jPlayer, income, pointAmount, 0.0);
if (GconfigManager.LoggingUse) { if (GconfigManager.LoggingUse) {
HashMap<CurrencyType, Double> amounts = new HashMap<CurrencyType, Double>(); HashMap<CurrencyType, Double> amounts = new HashMap<>();
amounts.put(CurrencyType.MONEY, income); amounts.put(CurrencyType.MONEY, income);
loging.recordToLog(jPlayer, info, amounts); loging.recordToLog(jPlayer, info, amounts);
} }
@ -1133,7 +1130,7 @@ public class Jobs extends JavaPlugin {
int oldLevel = prog.getLevel(); int oldLevel = prog.getLevel();
if (GconfigManager.LoggingUse) { if (GconfigManager.LoggingUse) {
HashMap<CurrencyType, Double> amounts = new HashMap<CurrencyType, Double>(); HashMap<CurrencyType, Double> amounts = new HashMap<>();
amounts.put(CurrencyType.MONEY, income); amounts.put(CurrencyType.MONEY, income);
amounts.put(CurrencyType.EXP, expAmount); amounts.put(CurrencyType.EXP, expAmount);
amounts.put(CurrencyType.POINTS, pointAmount); amounts.put(CurrencyType.POINTS, pointAmount);
@ -1290,7 +1287,7 @@ public class Jobs extends JavaPlugin {
int oldLevel = prog.getLevel(); int oldLevel = prog.getLevel();
if (GconfigManager.LoggingUse) { if (GconfigManager.LoggingUse) {
HashMap<CurrencyType, Double> amounts = new HashMap<CurrencyType, Double>(); HashMap<CurrencyType, Double> amounts = new HashMap<>();
amounts.put(CurrencyType.MONEY, payment.getAmount()); amounts.put(CurrencyType.MONEY, payment.getAmount());
amounts.put(CurrencyType.EXP, payment.getExp()); amounts.put(CurrencyType.EXP, payment.getExp());
amounts.put(CurrencyType.POINTS, payment.getPoints()); amounts.put(CurrencyType.POINTS, payment.getPoints());