diff --git a/src/com/massivecraft/mcore/money/Money.java b/src/com/massivecraft/mcore/money/Money.java index 1f0b6a57..bd56681d 100644 --- a/src/com/massivecraft/mcore/money/Money.java +++ b/src/com/massivecraft/mcore/money/Money.java @@ -94,7 +94,7 @@ public class Money } // -------------------------------------------- // - // GET AND SET + // CHECK // -------------------------------------------- // public static double get(Object universe, Object accountId) @@ -108,6 +108,21 @@ public class Money return get(account, account); } + public static boolean has(Object universe, Object accountId, double amount) + { + if (disabled(universe)) return false; + return mixin.has(universe(universe), accountId(accountId), amount); + } + + public static boolean has(Object account, double amount) + { + return has(account, account, amount); + } + + // -------------------------------------------- // + // MODIFY + // -------------------------------------------- // + public static boolean set(Object universe, Object accountId, double amount) { if (disabled(universe)) return false; @@ -119,10 +134,6 @@ public class Money return set(account, account, amount); } - // -------------------------------------------- // - // MODIFY - // -------------------------------------------- // - public static boolean add(Object universe, Object accountId, double amount) { if (disabled(universe)) return false; diff --git a/src/com/massivecraft/mcore/money/MoneyMixin.java b/src/com/massivecraft/mcore/money/MoneyMixin.java index 5c87b2a0..59789e1f 100644 --- a/src/com/massivecraft/mcore/money/MoneyMixin.java +++ b/src/com/massivecraft/mcore/money/MoneyMixin.java @@ -24,16 +24,18 @@ public interface MoneyMixin public boolean create(String universe, String accountId); // -------------------------------------------- // - // GET AND SET + // CHECK // -------------------------------------------- // public double get(String universe, String accountId); - public boolean set(String universe, String accountId, double amount); + public boolean has(String universe, String accountId, double amount); + // -------------------------------------------- // // MODIFY // -------------------------------------------- // + public boolean set(String universe, String accountId, double amount); public boolean add(String universe, String accountId, double amount); public boolean subtract(String universe, String accountId, double amount); diff --git a/src/com/massivecraft/mcore/money/MoneyMixinVault.java b/src/com/massivecraft/mcore/money/MoneyMixinVault.java index 1c819727..5d648239 100644 --- a/src/com/massivecraft/mcore/money/MoneyMixinVault.java +++ b/src/com/massivecraft/mcore/money/MoneyMixinVault.java @@ -87,7 +87,7 @@ public class MoneyMixinVault extends MoneyMixinAbstract } // -------------------------------------------- // - // GET AND SET + // CHECK // -------------------------------------------- // @Override @@ -97,16 +97,22 @@ public class MoneyMixinVault extends MoneyMixinAbstract } @Override - public boolean set(String universe, String accountId, double amount) - { - double current = get(universe, accountId); - return add(universe, accountId, amount - current); + public boolean has(String universe, String accountId, double amount) + { + return this.economy.has(accountId, universe, amount); } // -------------------------------------------- // // MODIFY // -------------------------------------------- // + @Override + public boolean set(String universe, String accountId, double amount) + { + double current = get(universe, accountId); + return add(universe, accountId, amount - current); + } + @Override public boolean add(String universe, String accountId, double amount) {