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

Merge remote-tracking branch 'upstream/master' 

Conflicts:
	src/net/milkbowl/vault/Vault.java
	src/net/milkbowl/vault/economy/plugins/Economy_BOSE7.java
This commit is contained in:
mung3r 2011-10-10 00:19:50 -07:00
parent 0c59ed0d9f 3a752c0747
commit ddbecef78b
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -93,7 +93,11 @@ public class Vault extends JavaPlugin {
}
// Try to load BOSEconomy
<<<<<<< HEAD
if (packageExists(new String[] { "cosine.boseconomy.BOSEconomy", "cosine.boseconomy.CommandManager" })) {
=======
if (packageExists(new String[] { "cosine.boseconomy.BOSEconomy" })) {
>>>>>>> upstream/master
Economy bose6 = new Economy_BOSE6(this);
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"));
@ -101,7 +105,11 @@ public class Vault extends JavaPlugin {
log.info(String.format("[%s][Economy] BOSEconomy6 not found.", getDescription().getName()));
}
// Try to load BOSEconomy
<<<<<<< HEAD
if (packageExists(new String[] { "cosine.boseconomy.BOSEconomy", "cosine.boseconomy.CommandHandler" })) {
=======
if (packageExists(new String[] { "cosine.boseconomy.BOSEconomy" })) {
>>>>>>> upstream/master
Economy bose7 = new Economy_BOSE7(this);
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"));

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

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