Upstream/ChestShop-3
1
0
Fork 0
mirror of https://github.com/ChestShop-authors/ChestShop-3.git synced 2024-09-27 14:13:05 +02:00
Code Issues Projects Releases Wiki Activity

Renamed serverAccount() to getServerAccountName()

Browse Source 
-
This commit is contained in:
meiamsome 2012-08-24 17:36:35 +02:00
parent 80f658e748
commit 3e04048e67
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
com/Acrobot/ChestShop/Economy/Economy.java
View File

@ -17,26 +17,26 @@ public class Economy {
return !p.isEmpty() && economy.hasAccount(uName.getName(p)); return !p.isEmpty() && economy.hasAccount(uName.getName(p));
} }
public static String serverAccount() { public static String getServerAccountName() {
return Config.getString(Property.SERVER_ECONOMY_ACCOUNT); return Config.getString(Property.SERVER_ECONOMY_ACCOUNT);
} }
public static boolean isServerAccount(String acc) { public static boolean isServerAccount(String acc) {
return serverAccount().equals(acc); return getServerAccountName().equals(acc);
} }
public static void add(String name, double amount) { public static void add(String name, double amount) {
Property taxAmount = isServerAccount(name) ? Property.SERVER_TAX_AMOUNT : Property.TAX_AMOUNT; Property taxAmount = isServerAccount(name) ? Property.SERVER_TAX_AMOUNT : Property.TAX_AMOUNT;
double tax = getTax(taxAmount, amount); double tax = getTax(taxAmount, amount);
if(tax != 0) { if (tax != 0) {
if (!serverAccount().isEmpty()) { if (!serverAccount().isEmpty()) {
economy.add(serverAccount(), tax); economy.add(getServerAccountName(), tax);
} }
amount -= tax; amount -= tax;
} }
if(name.isEmpty()) return; if (name.isEmpty()) return;
economy.add(uName.getName(name), amount); economy.add(uName.getName(name), amount);
} }
@ -45,12 +45,12 @@ public class Economy {
} }
public static void subtract(String name, double amount) { public static void subtract(String name, double amount) {
if(name.isEmpty()) return; if (name.isEmpty()) return;
economy.subtract(uName.getName(name), roundUp(amount)); economy.subtract(uName.getName(name), roundUp(amount));
} }
public static boolean hasEnough(String name, double amount) { public static boolean hasEnough(String name, double amount) {
if(isServerAccount(name)) { if (isServerAccount(name)) {
return true; return true;
} }
return economy.hasEnough(uName.getName(name), roundUp(amount)); return economy.hasEnough(uName.getName(name), roundUp(amount));