Skip to content

Commit 301d670

Browse files
committed
unfreeze server Vault account, instead prevent sending in /bank send
1 parent 8d18314 commit 301d670

File tree

4 files changed

+11
-1
lines changed

4 files changed

+11
-1
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ private static void createServerVaultAccount() {
350350
if (serverAccount.isPresent()) return;
351351

352352
final @NotNull String name = getInstance().config().integrationsVaultServerAccount();
353-
new Account(getConsoleOfflinePlayer(), Account.Type.VAULT, name, BigDecimal.ZERO, true).insert();
353+
new Account(getConsoleOfflinePlayer(), Account.Type.VAULT, name, BigDecimal.ZERO, false).insert();
354354
}
355355
}
356356

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -716,6 +716,11 @@ public int invoicePerPage() {
716716
return MiniMessage.miniMessage().deserialize(Objects.requireNonNull(config.getString("messages.errors.delete-vault-account")));
717717
}
718718

719+
//messages.errors.transfer-to-server-vault
720+
public @NotNull Component messagesErrorsTransferToServerVault() {
721+
return MiniMessage.miniMessage().deserialize(Objects.requireNonNull(config.getString("messages.errors.transfer-to-server-vault")));
722+
}
723+
719724
// messages.balance
720725
public @NotNull Component messagesBalance(final @NotNull Account account) {
721726
return MiniMessage.miniMessage().deserialize(

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -530,6 +530,9 @@ public static boolean transfer(final @NotNull CommandSender sender, final @NotNu
530530
if (!sender.hasPermission(Permissions.TRANSFER_SELF) && to.get().owner.getUniqueId()
531531
.equals(BankAccounts.getOfflinePlayer(sender).getUniqueId()))
532532
return sendMessage(sender, BankAccounts.getInstance().config().messagesErrorsTransferOtherOnly());
533+
// to is server Vault account
534+
if (to.get().owner.getUniqueId().equals(BankAccounts.getConsoleOfflinePlayer().getUniqueId()) && to.get().type == Account.Type.VAULT)
535+
return sendMessage(sender, BankAccounts.getInstance().config().messagesErrorsTransferToServerVault());
533536

534537
final @NotNull BigDecimal amount;
535538
try {

src/main/resources/config.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -367,6 +367,8 @@ messages:
367367
async-failed: "<red>(!) The request failed. See the console for details.</red>"
368368
# Trying to delete vault integration account
369369
delete-vault-account: "<red>(!) You cannot delete this account.</red>"
370+
# Trying to transfer funds to the server Vault account
371+
transfer-to-server-vault: "<red>(!) You cannot transfer funds to this account. This account is for internal use only.</red>"
370372

371373
# Account balance
372374
# Available placeholders:

0 commit comments

Comments
 (0)