Upstream/Jobs
1
0
Fork 0
mirror of https://github.com/Zrips/Jobs.git synced 2025-03-10 13:49:07 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #278 from sync667/master

Browse Source 
Payments task bug fix
This commit is contained in:
montlikadani 2018-10-30 18:54:17 +01:00 committed by GitHub
commit b682f1f8c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/gamingmesh/jobs/CMILib/CMIItemStack.java
View File

@ -172,7 +172,7 @@ public class CMIItemStack {
meta.setLore(lore);
}
return meta.getLore() == null ? new ArrayList<>() : meta.getLore();
return meta.getLore() == null ? new ArrayList<String>() : meta.getLore();
}
return new ArrayList<>();
}

5
src/main/java/com/gamingmesh/jobs/economy/BufferedEconomy.java
View File

@ -140,8 +140,9 @@ public class BufferedEconomy {
this.ServerTaxesAccount = Bukkit.getOfflinePlayer(ServerTaxesAccountname);
if (Jobs.getGCManager().UseTaxes && Jobs.getGCManager().TransferToServerAccount && ServerTaxesAccount != null) {
economy.depositPlayer(ServerTaxesAccount, TaxesAmount);
if(TaxesAmount > 0) {
economy.depositPlayer(ServerTaxesAccount, TaxesAmount);
}
if (ServerTaxesAccount.isOnline()) {
if (!Jobs.getActionbarToggleList().containsKey(ServerTaxesAccountname) && Jobs.getGCManager().ActionBarsMessageByDefault)
Jobs.getActionbarToggleList().put(ServerTaxesAccountname, true);