Skip to content

Commit 76de9f3

Browse files
committed
fix bank terminal auth check
1 parent e01bb7c commit 76de9f3

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

changelog.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Additions
55
- Entry
66

77
Fixes
8-
- Entry
8+
- Bank terminals properly check authorization now
99

1010
Removals
1111
- Entry

common/src/main/java/dev/ithundxr/createnumismatics/content/bank/BankTerminalBlock.java

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,23 +67,28 @@ protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockSt
6767

6868
@SuppressWarnings("StatementWithEmptyBody")
6969
@Override
70-
public InteractionResult use(BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) {
70+
public @NotNull InteractionResult use(@NotNull BlockState state, Level level, @NotNull BlockPos pos,
71+
@NotNull Player player, @NotNull InteractionHand hand,
72+
@NotNull BlockHitResult hit) {
7173
if (level.isClientSide)
7274
return InteractionResult.SUCCESS;
7375

7476
ItemStack handStack = player.getItemInHand(hand);
7577

7678
BankAccount account = null;
7779

78-
if (NumismaticsTags.AllItemTags.CARDS.matches(handStack) && CardItem.isBound(handStack)
79-
&& (account = Numismatics.BANK.getAccount(CardItem.get(handStack))) != null && account.isAuthorized(player)) {
80-
// intentionally left blank
80+
if (NumismaticsTags.AllItemTags.CARDS.matches(handStack) && CardItem.isBound(handStack)) {
81+
account = Numismatics.BANK.getAccount(CardItem.get(handStack));
8182
}
8283
if (account == null) {
8384
account = Numismatics.BANK.getAccount(player);
8485
}
8586

86-
Utils.openScreen((ServerPlayer) player, account, account::sendToMenu);
87-
return InteractionResult.SUCCESS;
87+
if (account.isAuthorized(player)) {
88+
Utils.openScreen((ServerPlayer) player, account, account::sendToMenu);
89+
return InteractionResult.SUCCESS;
90+
} else {
91+
return InteractionResult.FAIL;
92+
}
8893
}
8994
}

0 commit comments

Comments
 (0)