From 5428fa372271f979d058004940da8b38b8b3976e Mon Sep 17 00:00:00 2001 From: BuildTools Date: Wed, 9 Mar 2016 17:18:21 +0100 Subject: [PATCH] 1h Better money round --- .../massivecore/money/MoneyMixinAbstract.java | 8 +++++++- .../massivecraft/massivecore/money/MoneyMixinVault.java | 3 ++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/com/massivecraft/massivecore/money/MoneyMixinAbstract.java b/src/com/massivecraft/massivecore/money/MoneyMixinAbstract.java index 57011bcb..b5ea9335 100644 --- a/src/com/massivecraft/massivecore/money/MoneyMixinAbstract.java +++ b/src/com/massivecraft/massivecore/money/MoneyMixinAbstract.java @@ -27,7 +27,7 @@ public abstract class MoneyMixinAbstract implements MoneyMixin if (fractionalDigits < 0) return amount; // 0 means no fractional digits - if (fractionalDigits == 0) return Math.ceil(amount); + if (fractionalDigits == 0) return moneyCeil(amount); // OK! I'll have to calculate :P int factor = (int) Math.round(Math.pow(10, fractionalDigits)); @@ -38,6 +38,12 @@ public abstract class MoneyMixinAbstract implements MoneyMixin return amount; } + public static double moneyCeil(double amount) + { + if (amount < 0) return Math.floor(amount); + else return Math.ceil(amount); + } + // -------------------------------------------- // // MOVE // -------------------------------------------- // diff --git a/src/com/massivecraft/massivecore/money/MoneyMixinVault.java b/src/com/massivecraft/massivecore/money/MoneyMixinVault.java index e657afeb..e53bbfb3 100644 --- a/src/com/massivecraft/massivecore/money/MoneyMixinVault.java +++ b/src/com/massivecraft/massivecore/money/MoneyMixinVault.java @@ -71,13 +71,14 @@ public class MoneyMixinVault extends MoneyMixinAbstract else { int fractionalDigits = this.fractionalDigits(); + amount = prepare(amount); if (fractionalDigits < 0) { return String.valueOf(amount); } else if (fractionalDigits == 0) { - return String.valueOf((int)Math.round(amount)); + return String.valueOf((int)amount); } else {