Skip to content

Commit 37cecdb

Browse files
committed
fix: check for request expiration in accept command
1 parent f83c8a9 commit 37cecdb

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -585,7 +585,6 @@ public boolean expired() {
585585
* @return Whether the change was successful
586586
*/
587587
public boolean confirm() {
588-
if (expired()) return false;
589588
final @NotNull Optional<@NotNull Account> account = this.account();
590589
if (account.isEmpty()) return false;
591590
if (account.get().frozen) return false;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,7 @@ else if (accounts.length == 1)
548548
return new Message(sender, BankAccounts.getInstance().config().messagesErrorsNoPermission());
549549
if (args.length < 1) return sendUsage(sender, label, "acceptchangeowner <account>");
550550
final @NotNull Optional<Account.@NotNull ChangeOwnerRequest> request = Account.ChangeOwnerRequest.get(args[0], BankAccounts.getOfflinePlayer(sender));
551-
if (request.isEmpty())
551+
if (request.isEmpty() || request.get().expired())
552552
return new Message(sender, BankAccounts.getInstance().config().messagesErrorsChangeOwnerNotFound());
553553
final @NotNull Optional<@NotNull Account> account = request.get().account();
554554
if (account.isEmpty()) {

0 commit comments

Comments
 (0)