Merge branch 'master' into 95-automatic-invoice-notifications

Author: zefir-git

src/main/java/pro/cloudnode/smp/bankaccounts/BankAccounts.java

@@ -334,7 +334,7 @@ private static void createServerAccount() {
             final @NotNull Optional<@NotNull Account> account = Account.getServerAccount();
             if (account.isPresent()) return;
 
-            final @Nullable String name = getInstance().config().serverAccountName();
+            final @NotNull String name = getInstance().config().serverAccountName();
             final @NotNull Account.Type type = getInstance().config().serverAccountType();
             final @Nullable BigDecimal balance = getInstance().config().serverAccountStartingBalance();
             new Account(getConsoleOfflinePlayer(), type, name, balance, false).insert();
@@ -349,8 +349,8 @@ private static void createServerVaultAccount() {
             final @NotNull Optional<@NotNull Account> serverAccount = Account.getServerVaultAccount();
             if (serverAccount.isPresent()) return;
 
-            final @Nullable String name = getInstance().config().integrationsVaultServerAccount();
-            new Account(getConsoleOfflinePlayer(), Account.Type.VAULT, name, BigDecimal.ZERO, true);
+            final @NotNull String name = getInstance().config().integrationsVaultServerAccount();
+            new Account(getConsoleOfflinePlayer(), Account.Type.VAULT, name, BigDecimal.ZERO, false).insert();
         }
     }
 

src/main/java/pro/cloudnode/smp/bankaccounts/BankConfig.java

@@ -726,6 +726,11 @@ public int invoiceNotifyInterval() {
         return MiniMessage.miniMessage().deserialize(Objects.requireNonNull(config.getString("messages.errors.delete-vault-account")));
     }
 
+    //messages.errors.transfer-to-server-vault
+    public @NotNull Component messagesErrorsTransferToServerVault() {
+        return MiniMessage.miniMessage().deserialize(Objects.requireNonNull(config.getString("messages.errors.transfer-to-server-vault")));
+    }
+
     // messages.balance
     public @NotNull Component messagesBalance(final @NotNull Account account) {
         return MiniMessage.miniMessage().deserialize(

src/main/java/pro/cloudnode/smp/bankaccounts/commands/BankCommand.java

@@ -530,6 +530,9 @@ public static boolean transfer(final @NotNull CommandSender sender, final @NotNu
         if (!sender.hasPermission(Permissions.TRANSFER_SELF) && to.get().owner.getUniqueId()
                 .equals(BankAccounts.getOfflinePlayer(sender).getUniqueId()))
             return sendMessage(sender, BankAccounts.getInstance().config().messagesErrorsTransferOtherOnly());
+        // to is server Vault account
+        if (to.get().owner.getUniqueId().equals(BankAccounts.getConsoleOfflinePlayer().getUniqueId()) && to.get().type == Account.Type.VAULT)
+            return sendMessage(sender, BankAccounts.getInstance().config().messagesErrorsTransferToServerVault());
 
         final @NotNull BigDecimal amount;
         try {

src/main/resources/config.yml

@@ -376,6 +376,8 @@ messages:
         async-failed: "<red>(!) The request failed. See the console for details.</red>"
         # Trying to delete vault integration account
         delete-vault-account: "<red>(!) You cannot delete this account.</red>"
+        # Trying to transfer funds to the server Vault account
+        transfer-to-server-vault: "<red>(!) You cannot transfer funds to this account. This account is for internal use only.</red>"
 
     # Account balance
     # Available placeholders: