Fix issues in TNEAccount methods not checking currency parameter for …

…hasHoldings.
TheNewEconomy · Aug 2, 2020 · f98dbe4 · f98dbe4
1 parent e811fc8
commit f98dbe4
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/TNE/src/net/tnemc/core/common/account/TNEAccount.java b/TNE/src/net/tnemc/core/common/account/TNEAccount.java
@@ -462,7 +462,7 @@ public EconomyResponse removeHoldings(BigDecimal amount) {
  @Override
  public EconomyResponse removeHoldings(BigDecimal amount, String world) {
  if(amount.equals(BigDecimal.ZERO)) return GeneralResponse.SUCCESS;
- if(hasHoldings(amount)) {
+ if(hasHoldings(amount, world)) {
  Currency currency = TNE.manager().currencyManager().get(world);
  removeHoldings(amount, world, currency.name(), false);
  return GeneralResponse.SUCCESS;
@@ -473,7 +473,7 @@ public EconomyResponse removeHoldings(BigDecimal amount, String world) {
  @Override
  public EconomyResponse removeHoldings(BigDecimal amount, Currency currency) {
  if(amount.equals(BigDecimal.ZERO)) return GeneralResponse.SUCCESS;
- if(hasHoldings(amount)) {
+ if(hasHoldings(amount, currency)) {
  String world = TNE.instance().defaultWorld;
  removeHoldings(amount, world, currency.name(), false);
  return GeneralResponse.SUCCESS;
@@ -484,7 +484,7 @@ public EconomyResponse removeHoldings(BigDecimal amount, Currency currency) {
  @Override
  public EconomyResponse removeHoldings(BigDecimal amount, Currency currency, String world) {
  if(amount.equals(BigDecimal.ZERO)) return GeneralResponse.SUCCESS;
- if(hasHoldings(amount)) {
+ if(hasHoldings(amount, currency, world)) {
  removeHoldings(amount, world, currency.name(), false);
  return GeneralResponse.SUCCESS;
  }