Fix a bug where the CONSOLE account does not have an infinite balance…

… on databases upgraded from older versions.

SaneEconomyCore/src/main/java/org/appledash/saneeconomy/economy/EconomyManager.java

@@ -4,6 +4,7 @@
 import org.appledash.saneeconomy.SaneEconomy;
 import org.appledash.saneeconomy.economy.backend.EconomyStorageBackend;
 import org.appledash.saneeconomy.economy.economable.Economable;
+import org.appledash.saneeconomy.economy.economable.EconomableConsole;
 import org.appledash.saneeconomy.economy.transaction.Transaction;
 import org.appledash.saneeconomy.economy.transaction.TransactionResult;
 import org.appledash.saneeconomy.event.SaneEconomyTransactionEvent;
@@ -67,7 +68,7 @@ public boolean accountExists(Economable player) {
      * @return Player's balance
      */
     public BigDecimal getBalance(Economable targetPlayer) {
-        if (targetPlayer == Economable.CONSOLE) {
+        if (EconomableConsole.isConsole(targetPlayer)) {
             return new BigDecimal(Double.MAX_VALUE);
         }
 
@@ -82,7 +83,7 @@ public BigDecimal getBalance(Economable targetPlayer) {
      * @return True if they have requiredBalance or more, false otherwise
      */
     public boolean hasBalance(Economable targetPlayer, BigDecimal requiredBalance) {
-        return (targetPlayer == Economable.CONSOLE) || (this.getBalance(targetPlayer).compareTo(requiredBalance) >= 0);
+        return (EconomableConsole.isConsole(targetPlayer)) || (this.getBalance(targetPlayer).compareTo(requiredBalance) >= 0);
 
     }
 
@@ -120,7 +121,7 @@ private void subtractBalance(Economable targetPlayer, BigDecimal amount) {
     public void setBalance(Economable targetPlayer, BigDecimal amount) {
         amount = NumberUtils.filterAmount(this.currency, amount);
 
-        if (targetPlayer == Economable.CONSOLE) {
+        if (EconomableConsole.isConsole(targetPlayer)) {
             return;
         }
 

SaneEconomyCore/src/main/java/org/appledash/saneeconomy/economy/economable/EconomableConsole.java

@@ -1,17 +1,32 @@
 package org.appledash.saneeconomy.economy.economable;
 
+import java.util.UUID;
+
 /**
  * Created by appledash on 9/21/16.
  * Blackjack is best pony.
  */
 public class EconomableConsole implements Economable {
+    public static final UUID CONSOLE_UUID = new UUID( 0xf88708c237d84a0bL, 0x944259c68e517557L); // Pregenerated for performance
+
     @Override
     public String getName() {
         return "CONSOLE";
     }
 
     @Override
     public String getUniqueIdentifier() {
-        return "CONSOLE";
+        return "console:" + CONSOLE_UUID.toString();
+    }
+
+    public static boolean isConsole(Economable economable) {
+        try {
+            UUID uuid = UUID.fromString(economable.getUniqueIdentifier().split(":")[1]);
+
+            // Fast comparison + fix for bugs with older databases
+            return economable == Economable.CONSOLE || (uuid.getLeastSignificantBits() == CONSOLE_UUID.getLeastSignificantBits() || uuid.getMostSignificantBits() == CONSOLE_UUID.getMostSignificantBits());
+        } catch (Exception e) {
+            return false;
+        }
     }
 }

SaneEconomyCore/src/main/java/org/appledash/saneeconomy/economy/transaction/Transaction.java

@@ -2,6 +2,7 @@
 
 import org.appledash.saneeconomy.economy.Currency;
 import org.appledash.saneeconomy.economy.economable.Economable;
+import org.appledash.saneeconomy.economy.economable.EconomableConsole;
 import org.appledash.saneeconomy.economy.transaction.TransactionReason.AffectedParties;
 import org.appledash.saneeconomy.utils.NumberUtils;
 
@@ -46,15 +47,15 @@ public TransactionReason getReason() {
     }
 
     public boolean isSenderAffected() {
-        if (this.sender == Economable.CONSOLE) {
+        if (EconomableConsole.isConsole(this.sender)) {
             return false;
         }
 
         return (this.reason.getAffectedParties() == AffectedParties.SENDER) || (this.reason.getAffectedParties() == AffectedParties.BOTH);
     }
 
     public boolean isReceiverAffected() {
-        if (this.receiver == Economable.CONSOLE) {
+        if (EconomableConsole.isConsole(this.receiver)) {
             return false;
         }