Merge pull request #66 from myth-MC/dev/1.1

1.1.1

Author: U8092

VERSION

@@ -1 +1 @@
-1.1.0
+1.1.1

api/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>ovh.mythmc</groupId>
         <artifactId>banco</artifactId>
-        <version>1.1.0</version>
+        <version>1.1.1</version>
     </parent>
 
     <artifactId>banco-api</artifactId>

api/src/main/java/ovh/mythmc/banco/api/accounts/AccountDatabase.java

@@ -6,7 +6,6 @@
 import java.nio.file.Files;
 import java.sql.SQLException;
 import java.util.Collection;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -41,7 +40,7 @@ public final class AccountDatabase {
 
     private final Map<AccountIdentifierKey, Account> cache = new ConcurrentHashMap<>();
 
-    private final Collection<AccountIdentifierKey> accountIdentifierCache = new HashSet<>();
+    private final Set<AccountIdentifierKey> accountIdentifierCache = ConcurrentHashMap.newKeySet();
 
     private boolean firstBoot = false;
 
@@ -289,6 +288,9 @@ public void upgrade() {
                 getDao().executeRaw("ALTER TABLE `accounts` ADD COLUMN name STRING;");
                 logger.info("Done!");
             } catch (SQLException e) {
+                if (e.getMessage().contains("Could not run raw execute statement ALTER TABLE `accounts` ADD COLUMN name STRING"))
+                    return;
+                    
                 logger.error("Exception while upgrading database: {}", e);
             }
         } 
@@ -299,4 +301,4 @@ public void upgrade() {
         Banco.get().getSettings().updateVersion(2);  
     }
 
-}
+}

api/src/main/java/ovh/mythmc/banco/api/accounts/AccountManager.java

@@ -4,7 +4,6 @@
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
-import org.bukkit.Bukkit;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.ApiStatus.Internal;
@@ -40,6 +39,8 @@ public final class AccountManager {
     public synchronized void create(final @NotNull UUID uuid) {
         Account account = new Account();
         account.setUuid(uuid);
+        account.setAmount(BigDecimal.ZERO);
+        account.setTransactions(BigDecimal.ZERO);
 
         create(account);
     }
@@ -53,6 +54,8 @@ public synchronized void create(final @NotNull UUID uuid, final @NotNull String
         Account account = new Account();
         account.setUuid(uuid);
         account.setName(name);
+        account.setAmount(BigDecimal.ZERO);
+        account.setTransactions(BigDecimal.ZERO);
 
         create(account);
     }
@@ -215,8 +218,8 @@ public boolean has(final @NotNull Account account, final @NotNull BigDecimal amo
      */
     public @NotNull BigDecimal amount(final @NotNull Account account) {
         // Fake players / accounts
-        if (!Bukkit.getOfflinePlayer(account.getUuid()).hasPlayedBefore())
-            return account.getTransactions().add(getValueOfPlayer(account.getUuid(), false));
+        //if (!Bukkit.getOfflinePlayer(account.getUuid()).hasPlayedBefore())
+        //    return account.getTransactions().add(getValueOfPlayer(account.getUuid(), false));
 
         final Optional<OfflinePlayerReference> optionalOfflinePlayerReference = uuidResolver.resolveOfflinePlayer(account.getUuid());
 
@@ -229,7 +232,8 @@ public boolean has(final @NotNull Account account, final @NotNull BigDecimal amo
         }
 
         // Offline players
-        return account.getAmount().add(account.getTransactions());
+        //return account.getAmount().add(account.getTransactions());
+        return account.getTransactions().add(getValueOfPlayer(account.getUuid(), false)).add(account.getAmount());
     }
 
     @Internal

api/src/main/java/ovh/mythmc/banco/api/accounts/service/AbstractLocalUUIDResolver.java

@@ -1,9 +1,9 @@
 package ovh.mythmc.banco.api.accounts.service;
 
-import java.util.HashSet;
 import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
 
 import org.jetbrains.annotations.NotNull;
 
@@ -12,7 +12,7 @@
 
 public abstract class AbstractLocalUUIDResolver implements LocalUUIDResolver {
 
-    private final Set<OfflinePlayerReference> offlinePlayers = new HashSet<>();
+    private final Set<OfflinePlayerReference> offlinePlayers = ConcurrentHashMap.newKeySet();
 
     protected abstract Iterable<OfflinePlayerReference> serverOfflinePlayers();
 
@@ -77,4 +77,4 @@ protected boolean update(final @NotNull OfflinePlayerReference offlinePlayer) {
         return add(offlinePlayer);
     }
 
-}
+}

platform-bukkit/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>ovh.mythmc</groupId>
         <artifactId>banco</artifactId>
-        <version>1.1.0</version>
+        <version>1.1.1</version>
     </parent>
 
     <artifactId>banco-platform-bukkit</artifactId>

platform-common/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>ovh.mythmc</groupId>
         <artifactId>banco</artifactId>
-        <version>1.1.0</version>
+        <version>1.1.1</version>
     </parent>
 
     <artifactId>banco-common</artifactId>

platform-common/src/main/java/ovh/mythmc/banco/common/listeners/PlayerListener.java

@@ -8,29 +8,25 @@
 import lombok.RequiredArgsConstructor;
 import ovh.mythmc.banco.api.Banco;
 import ovh.mythmc.banco.api.accounts.Account;
-import ovh.mythmc.banco.api.scheduler.BancoScheduler;
 
-import java.math.BigDecimal;
 import java.util.UUID;
 
 @RequiredArgsConstructor
 public class PlayerListener implements Listener {
 
     @EventHandler
     public void onPlayerJoin(PlayerJoinEvent event) {
-        BancoScheduler.get().run(() ->{
-            UUID uuid = event.getPlayer().getUniqueId();
-            Account account = Banco.get().getAccountManager().getByUuid(uuid);
-    
-            if (account == null) {
-                account = new Account(uuid, event.getPlayer().getName(), BigDecimal.valueOf(0), BigDecimal.valueOf(0));
-                Banco.get().getAccountManager().create(account);
-            } else {
-                Banco.get().getAccountManager().updateName(account, event.getPlayer().getName());
-            }
-    
-            Banco.get().getAccountManager().updateTransactions(account);
-        });
+        UUID uuid = event.getPlayer().getUniqueId();
+        Account account = Banco.get().getAccountManager().getByUuid(uuid);
+
+        if (account == null) {
+            Banco.get().getAccountManager().create(uuid, event.getPlayer().getName());
+            account = Banco.get().getAccountManager().getByUuid(uuid);
+        } else {
+            Banco.get().getAccountManager().updateName(account, event.getPlayer().getName());
+        }
+
+        Banco.get().getAccountManager().updateTransactions(account);
     }
 
     @EventHandler

platform-paper/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>ovh.mythmc</groupId>
         <artifactId>banco</artifactId>
-        <version>1.1.0</version>
+        <version>1.1.1</version>
     </parent>
 
     <artifactId>banco-platform-paper</artifactId>

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>ovh.mythmc</groupId>
     <artifactId>banco</artifactId>
-    <version>1.1.0</version>
+    <version>1.1.1</version>
     <packaging>pom</packaging>
 
     <modules>