Upstream/Vault
1
0
Fork 0
mirror of https://github.com/MilkBowl/Vault.git synced 2025-03-12 14:49:36 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #7 from mung3r/master

Browse Source 
bose 6 & 7 tweaks
This commit is contained in:
mung3r 2011-10-10 00:34:43 -07:00
commit 60e9034ff1
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/net/milkbowl/vault/Vault.java
View File

@ -93,7 +93,7 @@ public class Vault extends JavaPlugin {
} }
// Try to load BOSEconomy // Try to load BOSEconomy
if (packageExists(new String[] { "cosine.boseconomy.BOSEconomy" })) { if (packageExists(new String[] { "cosine.boseconomy.BOSEconomy", "cosine.boseconomy.CommandManager" })) {
Economy bose6 = new Economy_BOSE6(this); Economy bose6 = new Economy_BOSE6(this);
getServer().getServicesManager().register(net.milkbowl.vault.economy.Economy.class, bose6, this, ServicePriority.Normal); getServer().getServicesManager().register(net.milkbowl.vault.economy.Economy.class, bose6, this, ServicePriority.Normal);
log.info(String.format("[%s][Economy] BOSEconomy6 found: %s", getDescription().getName(), bose6.isEnabled() ? "Loaded" : "Waiting")); log.info(String.format("[%s][Economy] BOSEconomy6 found: %s", getDescription().getName(), bose6.isEnabled() ? "Loaded" : "Waiting"));
@ -101,7 +101,7 @@ public class Vault extends JavaPlugin {
log.info(String.format("[%s][Economy] BOSEconomy6 not found.", getDescription().getName())); log.info(String.format("[%s][Economy] BOSEconomy6 not found.", getDescription().getName()));
} }
// Try to load BOSEconomy // Try to load BOSEconomy
if (packageExists(new String[] { "cosine.boseconomy.BOSEconomy" })) { if (packageExists(new String[] { "cosine.boseconomy.BOSEconomy", "cosine.boseconomy.CommandHandler" })) {
Economy bose7 = new Economy_BOSE7(this); Economy bose7 = new Economy_BOSE7(this);
getServer().getServicesManager().register(net.milkbowl.vault.economy.Economy.class, bose7, this, ServicePriority.Normal); getServer().getServicesManager().register(net.milkbowl.vault.economy.Economy.class, bose7, this, ServicePriority.Normal);
log.info(String.format("[%s][Economy] BOSEconomy7 found: %s", getDescription().getName(), bose7.isEnabled() ? "Loaded" : "Waiting")); log.info(String.format("[%s][Economy] BOSEconomy7 found: %s", getDescription().getName(), bose7.isEnabled() ? "Loaded" : "Waiting"));

4
src/net/milkbowl/vault/economy/plugins/Economy_BOSE6.java
View File

@ -196,9 +196,9 @@ public class Economy_BOSE6 implements Economy {
@Override @Override
public String format(double amount) { public String format(double amount) {
if (amount == 1) { if (amount == 1) {
return String.format("%f %s", amount, getMoneyNameSingular()); return String.format("%.0f %s", amount, getMoneyNameSingular());
} else { } else {
return String.format("%f %s", amount, getMoneyNamePlural()); return String.format("%.2f %s", amount, getMoneyNamePlural());
} }
} }
} }

4
src/net/milkbowl/vault/economy/plugins/Economy_BOSE7.java
View File

@ -196,9 +196,9 @@ public class Economy_BOSE7 implements Economy {
@Override @Override
public String format(double amount) { public String format(double amount) {
if (amount == 1) { if (amount == 1) {
return String.format("%f %s", amount, getMoneyNameSingular()); return String.format("%.0f %s", amount, getMoneyNameSingular());
} else { } else {
return String.format("%f %s", amount, getMoneyNamePlural()); return String.format("%.2f %s", amount, getMoneyNamePlural());
} }
} }
} }