Upstream
/
Vault
mirror of https://github.com/MilkBowl/Vault.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

cleaned up iCo5 checks

This commit is contained in:
Sleaker 2012-03-07 07:22:47 -08:00
parent 40215acfc6
commit 2836529aa6
1 changed files with 5 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/net/milkbowl/vault/economy/plugins/Economy_iConomy5.java
View File

@ -33,7 +33,6 @@ import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.java.JavaPlugin;
import com.iConomy.iConomy;
import com.iConomy.system.Account;
import com.iConomy.system.Holdings;
import com.iConomy.util.Constants;
@ -82,39 +81,19 @@ public class Economy_iConomy5 implements Economy {
@Override
public EconomyResponse withdrawPlayer(String playerName, double amount) {
double balance;
EconomyResponse.ResponseType type;
String errorMessage = null;
Account account = iConomy.getAccount(playerName);
Holdings holdings = account.getHoldings();
Holdings holdings = iConomy.getAccount(playerName).getHoldings();
if (holdings.hasEnough(amount)) {
holdings.subtract(amount);
balance = getAccountBalance(playerName);
type = EconomyResponse.ResponseType.SUCCESS;
return new EconomyResponse(amount, balance, type, errorMessage);
return new EconomyResponse(amount, getAccountBalance(playerName), ResponseType.SUCCESS, null);
} else {
amount = 0;
balance = getAccountBalance(playerName);
type = EconomyResponse.ResponseType.FAILURE;
errorMessage = "Insufficient funds";
return new EconomyResponse(amount, balance, type, errorMessage);
return new EconomyResponse(0, getAccountBalance(playerName), ResponseType.FAILURE, "Insufficient funds");
}
}
@Override
public EconomyResponse depositPlayer(String playerName, double amount) {
double balance;
EconomyResponse.ResponseType type;
String errorMessage = null;
Account account = iConomy.getAccount(playerName);
Holdings holdings = account.getHoldings();
holdings.add(amount);
balance = getAccountBalance(playerName);
type = EconomyResponse.ResponseType.SUCCESS;
return new EconomyResponse(amount, balance, type, errorMessage);
iConomy.getAccount(playerName).getHoldings().add(amount);
return new EconomyResponse(amount, getAccountBalance(playerName), EconomyResponse.ResponseType.SUCCESS, null);
}
public class EconomyServerListener implements Listener {