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

Minor tweaks to the Money static.

Browse Source
This commit is contained in:
Olof Larsson 2013-04-22 09:24:00 +02:00
parent 35599952e8
commit 2db041fea4
3 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/com/massivecraft/mcore/money/Money.java
View File

@ -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;

6
src/com/massivecraft/mcore/money/MoneyMixin.java
View File

@ -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);

14
src/com/massivecraft/mcore/money/MoneyMixinVault.java
View File

@ -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)
public boolean has(String universe, String accountId, double amount)
{
double current = get(universe, accountId);
return add(universe, accountId, amount - current);
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)
{