TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-02-12 04:20:41 +00:00
Code Issues Projects Releases Wiki Activity

Abort transaction before updating funds on balance overflow.

Browse source
This commit is contained in:
KHobbits 2014-05-25 17:03:23 +01:00
parent ada2fe01a2
commit 889dde7549
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Essentials/src/com/earth2me/essentials/UserData.java
View file

@ -115,17 +115,19 @@ public abstract class UserData extends PlayerExtension implements IConf
} }
public void setMoney(BigDecimal value, boolean throwError) throws MaxMoneyException public void setMoney(BigDecimal value, boolean throwError) throws MaxMoneyException
{ {
money = value;
BigDecimal maxMoney = ess.getSettings().getMaxMoney(); BigDecimal maxMoney = ess.getSettings().getMaxMoney();
BigDecimal minMoney = ess.getSettings().getMinMoney(); BigDecimal minMoney = ess.getSettings().getMinMoney();
if (money.compareTo(maxMoney) > 0) if (value.compareTo(maxMoney) > 0)
{ {
money = maxMoney;
if (throwError) if (throwError)
{ {
throw new MaxMoneyException(); throw new MaxMoneyException();
} }
money = maxMoney;
}
else {
money = value;
} }
if (money.compareTo(minMoney) < 0) if (money.compareTo(minMoney) < 0)
{ {

4
Essentials/src/com/earth2me/essentials/commands/Commandeco.java
View file

@ -105,8 +105,10 @@ public class Commandeco extends EssentialsLoopCommand
private void set(BigDecimal amount, final User player, final CommandSource sender) throws MaxMoneyException private void set(BigDecimal amount, final User player, final CommandSource sender) throws MaxMoneyException
{ {
BigDecimal minBalance = ess.getSettings().getMinMoney(); BigDecimal minBalance = ess.getSettings().getMinMoney();
BigDecimal maxBalance = ess.getSettings().getMaxMoney();
boolean underMinimum = (amount.compareTo(minBalance) < 0); boolean underMinimum = (amount.compareTo(minBalance) < 0);
player.setMoney(underMinimum ? minBalance : amount); boolean aboveMax = (amount.compareTo(maxBalance) > 0);
player.setMoney(underMinimum ? minBalance : aboveMax ? maxBalance : amount);
player.sendMessage(tl("setBal", NumberUtil.displayCurrency(player.getMoney(), ess))); player.sendMessage(tl("setBal", NumberUtil.displayCurrency(player.getMoney(), ess)));
if (sender != null) if (sender != null)
{ {