SpigotMC/Saber-Factions
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Workaround from player-exploiting the latest suggested config

Browse Source
This commit is contained in:
SvenjaReißaus 2019-03-14 10:00:48 -05:00
parent 0af0416235
commit 22670ddb15
No known key found for this signature in database
GPG Key ID: B14150951DBF6D29
6 changed files with 32 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/massivecraft/factions/Conf.java
View File

@ -241,6 +241,7 @@ public class Conf {
public static double econCostPower = 0.0; public static double econCostPower = 0.0;
public static double econCostShow = 0.0; public static double econCostShow = 0.0;
public static double econFactionStartingBalance = 0.0; public static double econFactionStartingBalance = 0.0;
public static double econDenyWithdrawWhenMinutesAgeLessThan = 2880; // 2 days
// -------------------------------------------- // // -------------------------------------------- //

5
src/main/java/com/massivecraft/factions/cmd/CmdMoneyTransferFf.java
View File

@ -42,7 +42,10 @@ public class CmdMoneyTransferFf extends FCommand {
if (to == null) { if (to == null) {
return; return;
} }
if (Conf.econFactionStartingBalance != 0 && (System.currentTimeMillis() - myFaction.getFoundedDate()) <= (Conf.econDenyWithdrawWhenMinutesAgeLessThan * 6000)) {
msg("Your faction is too young to transfer money like this");
return;
}
boolean success = Econ.transferMoney(fme, from, to, amount); boolean success = Econ.transferMoney(fme, from, to, amount);
if (success && Conf.logMoneyTransactions) { if (success && Conf.logMoneyTransactions) {

4
src/main/java/com/massivecraft/factions/cmd/CmdMoneyTransferFp.java
View File

@ -42,6 +42,10 @@ public class CmdMoneyTransferFp extends FCommand {
return; return;
} }
if (Conf.econFactionStartingBalance != 0 && (System.currentTimeMillis() - myFaction.getFoundedDate()) <= (Conf.econDenyWithdrawWhenMinutesAgeLessThan * 6000)) {
msg("Your faction is too young to transfer money like this");
return;
}
boolean success = Econ.transferMoney(fme, from, to, amount); boolean success = Econ.transferMoney(fme, from, to, amount);
if (success && Conf.logMoneyTransactions) { if (success && Conf.logMoneyTransactions) {

4
src/main/java/com/massivecraft/factions/cmd/CmdMoneyTransferPf.java
View File

@ -42,6 +42,10 @@ public class CmdMoneyTransferPf extends FCommand {
return; return;
} }
if (Conf.econFactionStartingBalance != 0 && (System.currentTimeMillis() - myFaction.getFoundedDate()) <= (Conf.econDenyWithdrawWhenMinutesAgeLessThan * 6000)) {
msg("Your faction is too young to transfer money like this");
return;
}
boolean success = Econ.transferMoney(fme, from, to, amount); boolean success = Econ.transferMoney(fme, from, to, amount);
if (success && Conf.logMoneyTransactions) { if (success && Conf.logMoneyTransactions) {

6
src/main/java/com/massivecraft/factions/cmd/CmdMoneyWithdraw.java
View File

@ -1,6 +1,7 @@
package com.massivecraft.factions.cmd; package com.massivecraft.factions.cmd;
import com.massivecraft.factions.Conf; import com.massivecraft.factions.Conf;
import com.massivecraft.factions.Faction;
import com.massivecraft.factions.SavageFactions; import com.massivecraft.factions.SavageFactions;
import com.massivecraft.factions.iface.EconomyParticipator; import com.massivecraft.factions.iface.EconomyParticipator;
import com.massivecraft.factions.integration.Econ; import com.massivecraft.factions.integration.Econ;
@ -45,6 +46,11 @@ public class CmdMoneyWithdraw extends FCommand {
return; return;
} }
if (Conf.econFactionStartingBalance != 0 && (System.currentTimeMillis() - myFaction.getFoundedDate()) <= (Conf.econDenyWithdrawWhenMinutesAgeLessThan * 6000)) {
msg("Your faction is too young to withdraw money like this");
return;
}
boolean success = Econ.transferMoney(fme, faction, fme, amount); boolean success = Econ.transferMoney(fme, faction, fme, amount);
if (success && Conf.logMoneyTransactions) { if (success && Conf.logMoneyTransactions) {

21
src/main/java/com/massivecraft/factions/zcore/persist/MemoryFaction.java
View File

@ -270,15 +270,20 @@ public abstract class MemoryFaction implements Faction, EconomyParticipator {
} }
if (Econ.shouldBeUsed() && !disbanderIsConsole) { if (Econ.shouldBeUsed() && !disbanderIsConsole) {
//Give all the faction's money to the disbander // Should we prevent to withdraw money if the faction was just created
double amount = Econ.getBalance(this.getAccountId()); if (Conf.econFactionStartingBalance != 0 && (System.currentTimeMillis() - this.foundedDate) <= (Conf.econDenyWithdrawWhenMinutesAgeLessThan * 6000)) {
Econ.transferMoney(fdisbander, this, fdisbander, amount, false); msg("Your faction is too young to withdraw money like this");
} else {
//Give all the faction's money to the disbander
double amount = Econ.getBalance(this.getAccountId());
Econ.transferMoney(fdisbander, this, fdisbander, amount, false);
if (amount > 0.0) { if (amount > 0.0) {
String amountString = Econ.moneyString(amount); String amountString = Econ.moneyString(amount);
msg(TL.COMMAND_DISBAND_HOLDINGS, amountString); msg(TL.COMMAND_DISBAND_HOLDINGS, amountString);
//TODO: Format this correctly and translate //TODO: Format this correctly and translate
SavageFactions.plugin.log(fdisbander.getName() + " has been given bank holdings of " + amountString + " from disbanding " + this.getTag() + "."); SavageFactions.plugin.log(fdisbander.getName() + " has been given bank holdings of " + amountString + " from disbanding " + this.getTag() + ".");
}
} }
} }