Upstream/Vault
1
0
Fork 0
mirror of https://github.com/MilkBowl/Vault.git synced 2025-01-30 20:11:34 +01:00
Code Issues Projects Releases Wiki Activity

fixed conflicts

Browse Source
This commit is contained in:
mung3r 2011-10-10 00:26:59 -07:00
parent ddbecef78b
commit 4a40e50891
2 changed files with 0 additions and 10 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,11 +93,7 @@ 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"));

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

@ -196,15 +196,9 @@ 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
}
}
}