From 735c49909f2782534176347e4a9dc9d782ff5458 Mon Sep 17 00:00:00 2001 From: Zrips Date: Fri, 13 Jan 2017 17:14:49 +0200 Subject: [PATCH] When getting final amount, keep in mind for negative values --- com/gamingmesh/jobs/Jobs.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/com/gamingmesh/jobs/Jobs.java b/com/gamingmesh/jobs/Jobs.java index 3f44d64a..b6beb23f 100644 --- a/com/gamingmesh/jobs/Jobs.java +++ b/com/gamingmesh/jobs/Jobs.java @@ -78,6 +78,7 @@ import com.gamingmesh.jobs.listeners.McMMOlistener; import com.gamingmesh.jobs.listeners.MythicMobsListener; import com.gamingmesh.jobs.listeners.PistonProtectionListener; import com.gamingmesh.jobs.stuff.ActionBar; +import com.gamingmesh.jobs.stuff.Debug; import com.gamingmesh.jobs.stuff.JobsClassLoader; import com.gamingmesh.jobs.stuff.Loging; import com.gamingmesh.jobs.stuff.TabComplete; @@ -915,7 +916,7 @@ public class Jobs extends JavaPlugin { // Calculate income if (income != 0D) { - income = income + (income * boost.getFinal(CurrencyType.MONEY)); + income = income + ((income > 0D ? income : -income) * boost.getFinal(CurrencyType.MONEY)); if (GconfigManager.useMinimumOveralPayment && income > 0) { double maxLimit = income * GconfigManager.MinimumOveralPaymentLimit; if (income < maxLimit) { @@ -926,7 +927,7 @@ public class Jobs extends JavaPlugin { // Calculate points if (pointAmount != 0D) { - pointAmount = pointAmount + (pointAmount * boost.getFinal(CurrencyType.POINTS)); + pointAmount = pointAmount + ((pointAmount > 0D ? pointAmount : -pointAmount) * boost.getFinal(CurrencyType.POINTS)); if (GconfigManager.useMinimumOveralPoints && pointAmount > 0) { double maxLimit = pointAmount * GconfigManager.MinimumOveralPaymentLimit; if (pointAmount < maxLimit) { @@ -936,7 +937,7 @@ public class Jobs extends JavaPlugin { } // Calculate exp - expAmount = expAmount + (expAmount * boost.getFinal(CurrencyType.EXP)); + expAmount = expAmount + ((expAmount > 0D ? expAmount : -expAmount) * boost.getFinal(CurrencyType.EXP)); if (GconfigManager.useMinimumOveralPayment && expAmount > 0) { double maxLimit = expAmount * GconfigManager.MinimumOveralPaymentLimit;