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

Fix different logic behavior for fast payment

Browse Source
This commit is contained in:
montlikadani 2020-10-23 16:53:49 +02:00
parent 22d985f0b4
commit 21673860c7
4 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/gamingmesh/jobs/PlayerManager.java
View File

@ -845,8 +845,7 @@ public class PlayerManager {
ItemBonusCache c = cj.get(prog); ItemBonusCache c = cj.get(prog);
if (c == null) { if (c == null) {
c = new ItemBonusCache(); c = new ItemBonusCache(getInventoryBoost(player, prog));
c.setBoostMultiplier(getInventoryBoost(player, prog));
cj.put(prog, c); cj.put(prog, c);
return c.getBoostMultiplier(); return c.getBoostMultiplier();
} }

8
src/main/java/com/gamingmesh/jobs/container/ItemBonusCache.java
View File

@ -4,11 +4,11 @@ public class ItemBonusCache {
private BoostMultiplier bm = new BoostMultiplier(); private BoostMultiplier bm = new BoostMultiplier();
public ItemBonusCache(BoostMultiplier bm) {
this.bm = bm;
}
public BoostMultiplier getBoostMultiplier() { public BoostMultiplier getBoostMultiplier() {
return bm; return bm;
} }
public void setBoostMultiplier(BoostMultiplier bm) {
this.bm = bm;
}
} }

8
src/main/java/com/gamingmesh/jobs/container/QuestProgression.java
View File

@ -122,13 +122,7 @@ public class QuestProgression {
jPlayer.setSaved(false); jPlayer.setSaved(false);
if (!isCompleted()) if (!isCompleted() || !jPlayer.isOnline() || givenReward)
return;
if (!jPlayer.isOnline())
return;
if (givenReward)
return; return;
givenReward = true; givenReward = true;

4
src/main/java/com/gamingmesh/jobs/listeners/JobsPaymentListener.java
View File

@ -384,8 +384,8 @@ public class JobsPaymentListener implements Listener {
FastPayment fp = Jobs.FASTPAYMENT.get(player.getUniqueId()); FastPayment fp = Jobs.FASTPAYMENT.get(player.getUniqueId());
if (fp != null) { if (fp != null) {
if (fp.getTime() > System.currentTimeMillis() && fp.getInfo().getName().equalsIgnoreCase(bInfo.getName()) || if (fp.getTime() > System.currentTimeMillis() && (fp.getInfo().getName().equalsIgnoreCase(bInfo.getName()) ||
fp.getInfo().getNameWithSub().equalsIgnoreCase(bInfo.getNameWithSub())) { fp.getInfo().getNameWithSub().equalsIgnoreCase(bInfo.getNameWithSub()))) {
Jobs.perform(fp.getPlayer(), fp.getInfo(), fp.getPayment(), fp.getJob()); Jobs.perform(fp.getPlayer(), fp.getInfo(), fp.getPayment(), fp.getJob());
return; return;
} }