Rx3/MassiveCore
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fetch the Economy every time. New services may always be registered.

Browse Source
This commit is contained in:
Olof Larsson 2015-02-23 22:14:44 +01:00
parent ee1f4cf9c9
commit 6b09cb600d
1 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/com/massivecraft/massivecore/money/MoneyMixinVault.java
View File

@ -26,9 +26,6 @@ public class MoneyMixinVault extends MoneyMixinAbstract
public void activate() public void activate()
{ {
if (Money.mixin() != null) return; if (Money.mixin() != null) return;
RegisteredServiceProvider<Economy> rsp = Bukkit.getServicesManager().getRegistration(Economy.class);
if (rsp == null) return;
this.economy = rsp.getProvider();
Money.mixin(this); Money.mixin(this);
} }
@ -41,7 +38,12 @@ public class MoneyMixinVault extends MoneyMixinAbstract
// FIELDS // FIELDS
// -------------------------------------------- // // -------------------------------------------- //
private Economy economy = null; public Economy getEconomy()
{
RegisteredServiceProvider<Economy> registeredServiceProvider = Bukkit.getServicesManager().getRegistration(Economy.class);
if (registeredServiceProvider == null) return null;
return registeredServiceProvider.getProvider();
}
// -------------------------------------------- // // -------------------------------------------- //
// ENABLED AND DISABLED // ENABLED AND DISABLED
@ -50,7 +52,9 @@ public class MoneyMixinVault extends MoneyMixinAbstract
@Override @Override
public boolean enabled() public boolean enabled()
{ {
return this.economy.isEnabled(); Economy economy = this.getEconomy();
if (economy == null) return false;
return economy.isEnabled();
} }
// -------------------------------------------- // // -------------------------------------------- //
@ -62,7 +66,7 @@ public class MoneyMixinVault extends MoneyMixinAbstract
{ {
if (includeUnit) if (includeUnit)
{ {
return this.economy.format(amount); return this.getEconomy().format(amount);
} }
else else
{ {
@ -85,13 +89,13 @@ public class MoneyMixinVault extends MoneyMixinAbstract
@Override @Override
public String singular() public String singular()
{ {
return this.economy.currencyNameSingular(); return this.getEconomy().currencyNameSingular();
} }
@Override @Override
public String plural() public String plural()
{ {
return this.economy.currencyNamePlural(); return this.getEconomy().currencyNamePlural();
} }
// -------------------------------------------- // // -------------------------------------------- //
@ -101,7 +105,7 @@ public class MoneyMixinVault extends MoneyMixinAbstract
@Override @Override
public int fractionalDigits() public int fractionalDigits()
{ {
return this.economy.fractionalDigits(); return this.getEconomy().fractionalDigits();
} }
// -------------------------------------------- // // -------------------------------------------- //
@ -111,7 +115,7 @@ public class MoneyMixinVault extends MoneyMixinAbstract
@Override @Override
public boolean exists(String accountId) public boolean exists(String accountId)
{ {
return this.economy.hasAccount(accountId); return this.getEconomy().hasAccount(accountId);
} }
@Override @Override
@ -128,14 +132,14 @@ public class MoneyMixinVault extends MoneyMixinAbstract
public double get(String accountId) public double get(String accountId)
{ {
this.ensureExists(accountId); this.ensureExists(accountId);
return this.economy.getBalance(accountId); return this.getEconomy().getBalance(accountId);
} }
@Override @Override
public boolean has(String accountId, double amount) public boolean has(String accountId, double amount)
{ {
this.ensureExists(accountId); this.ensureExists(accountId);
return this.economy.has(accountId, amount); return this.getEconomy().has(accountId, amount);
} }
// -------------------------------------------- // // -------------------------------------------- //
@ -145,6 +149,8 @@ public class MoneyMixinVault extends MoneyMixinAbstract
@Override @Override
public boolean move(String fromId, String toId, String byId, double amount, Collection<String> categories, String message) public boolean move(String fromId, String toId, String byId, double amount, Collection<String> categories, String message)
{ {
Economy economy = this.getEconomy();
// Ensure positive direction // Ensure positive direction
if (amount < 0) if (amount < 0)
{ {
@ -190,13 +196,15 @@ public class MoneyMixinVault extends MoneyMixinAbstract
public boolean ensureExists(String accountId) public boolean ensureExists(String accountId)
{ {
if (this.economy.hasAccount(accountId)) return true; Economy economy = this.getEconomy();
if (!this.economy.createPlayerAccount(accountId)) return false; if (economy.hasAccount(accountId)) return true;
if (!economy.createPlayerAccount(accountId)) return false;
if (MUtil.isValidPlayerName(accountId)) return true; if (MUtil.isValidPlayerName(accountId)) return true;
double balance = this.economy.getBalance(accountId); double balance = economy.getBalance(accountId);
economy.withdrawPlayer(accountId, balance); economy.withdrawPlayer(accountId, balance);
return true; return true;