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

Payment limit reset fix

Browse Source
This commit is contained in:
Zrips 2024-10-17 16:54:56 +03:00
parent 08f8fe807c
commit bdd8aa16bf
2 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/main/java/com/gamingmesh/jobs/economy/LimitsData.java
View File

@ -16,28 +16,22 @@ public class LimitsData {
@Deprecated
public LimitsData(CurrencyType type, long paymentsTime) {
this(type, paymentsTime, 0D);
init(type, paymentsTime, 0D);
}
@Deprecated
public LimitsData(CurrencyType type, long paymentsTime, double payment) {
this.type = type;
this.paymentsTime = paymentsTime;
CurrencyLimit limit = Jobs.getGCManager().getLimit(type);
if (limit.getResetsAt() != null) {
Calendar calendar = Calendar.getInstance();
calendar.setTime(new Date());
resetsAt = limit.getResetsAt().toMili();
} else
resetsAt = (limit.getTimeLimit() * 100L) + System.currentTimeMillis();
this.amount = payment;
init(type, paymentsTime, payment);
}
public LimitsData(CurrencyType type, double payment) {
this.type = type;
this.paymentsTime = System.currentTimeMillis();
CurrencyLimit limit = Jobs.getGCManager().getLimit(type);
init(type, System.currentTimeMillis(), payment);
}
private void init(CurrencyType type, long paymentsTime, double payment) {
this.type = type;
this.paymentsTime = paymentsTime;
CurrencyLimit limit = Jobs.getGCManager().getLimit(type);
if (limit.getResetsAt() != null) {
Calendar calendar = Calendar.getInstance();
calendar.setTime(new Date());
@ -79,8 +73,15 @@ public class LimitsData {
return paymentsTime;
}
private static long day = (1000L * 60L * 60L * 24L);
public void setPaymentsTime(long paymentsTime) {
this.paymentsTime = paymentsTime;
// If first payment time is over 24 hours, reset the amount
if (this.paymentsTime + day < resetsAt) {
setAmount(0);
setReseted(true);
}
}
public long getResetsAt() {

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

@ -76,12 +76,9 @@ public class PaymentData {
public void addNewAmount(CurrencyType type, Double Payment, Long time) {
// payments.put(type, new LimitsData(type, time == null ? System.currentTimeMillis() : time, Payment));
LimitsData data = new LimitsData(type, Payment);
if (time != null)
data.setPaymentsTime(time);
data.setPaymentsTime(time == null ? System.currentTimeMillis() : time);
payments.put(type, data);
}