Fix issues where balances were not being saved properly

TheNewEconomy · Mar 29, 2017 · 63e4619 · 63e4619
1 parent 6ef3283
commit 63e4619
Showing 1 changed file with 14 additions and 1 deletion.
diff --git a/src/com/github/tnerevival/core/version/impl/Alpha5_2.java b/src/com/github/tnerevival/core/version/impl/Alpha5_2.java
@@ -300,6 +300,13 @@ public Collection<Account> loadAccounts() {
         account.creditsFromString(sql().results(accountIndex).getString("inventory_credits"));
         account.commandsFromString(sql().results(accountIndex).getString("command_credits"));
         account.setPin(sql().results(accountIndex).getString("acc_pin"));
+        account.setSpecial(sql().results(accountIndex).getBoolean("account_special"));
+
+        String balancesTable = prefix + "_BALANCES";
+        int balancesIndex = sql().executePreparedQuery("SELECT * FROM " + balancesTable + " WHERE uuid = ?", new Object[] { account.getUid().toString() });
+        while(sql().results(balancesIndex).next()) {
+          account.setBalance(sql().results(balancesIndex).getString("world"), new BigDecimal(sql().results(balancesIndex).getDouble("balance")), sql().results(balancesIndex).getString("currency"));
+        }
 
         table = prefix + "_BANKS";
         int bankIndex = sql().executePreparedQuery("SELECT * FROM " + table + " WHERE uuid = ?;", new Object[] { account.getUid().toString() });
@@ -362,12 +369,18 @@ public Account loadAccount(UUID id) {
       });
       if(sql().results(accountIndex).next()) {
         Account account = new Account(UUID.fromString(sql().results(accountIndex).getString("uuid")), sql().results(accountIndex).getInt("accountnumber"));
-        account.balancesFromString(sql().results(accountIndex).getString("balances"));
         account.setStatus(sql().results(accountIndex).getString("accountstatus"));
         account.setJoined(sql().results(accountIndex).getString("joinedDate"));
         account.creditsFromString(sql().results(accountIndex).getString("inventory_credits"));
         account.commandsFromString(sql().results(accountIndex).getString("command_credits"));
         account.setPin(sql().results(accountIndex).getString("acc_pin"));
+        account.setSpecial(sql().results(accountIndex).getBoolean("account_special"));
+
+        String balancesTable = prefix + "_BALANCES";
+        int balancesIndex = sql().executePreparedQuery("SELECT * FROM " + balancesTable + " WHERE uuid = ?", new Object[] { account.getUid().toString() });
+        while(sql().results(balancesIndex).next()) {
+          account.setBalance(sql().results(balancesIndex).getString("world"), new BigDecimal(sql().results(balancesIndex).getDouble("balance")), sql().results(balancesIndex).getString("currency"));
+        }
 
         table = prefix + "_BANKS";
         int bankIndex = sql().executePreparedQuery("SELECT * FROM " + table + " WHERE uuid = ?;", new Object[] { account.getUid().toString() });