Skip to content

Handle invalid vault slots gracefully #202

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Maxlego08 merged 1 commit into from
Oct 16, 2025
Merged

Handle invalid vault slots gracefully #202

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions src/main/java/fr/maxlego08/essentials/buttons/vault/ButtonVaultSlotItems.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,10 @@ public void onRender(Player player, InventoryEngine inventory) {
}

private void setVaultItem(Integer slot, Vault vault, VaultItem vaultItem, InventoryEngine inventory, Player player) {
if (!isValidInventorySlot(slot)) {
this.plugin.getLogger().warning("Skip rendering invalid vault slot " + slot + " for vault " + vault.getVaultId());
return;
}
ItemStack itemStack = vaultItem.getDisplayItemStack(player, this.plugin.getComponentMessage());
inventory.addItem(slot, itemStack).setClick(event -> {
event.setCancelled(true);
Expand Down Expand Up @@ -101,13 +105,20 @@ private void onBagClick(Player player, Vault vault, VaultItem vaultItem, ClickTy
}

private void updateInventoryBag(Player player, VaultItem bagItem, int slot, InventoryEngine inventoryDefault, Vault vault) {
if (!isValidInventorySlot(slot)) {
return;
}

if (bagItem.getQuantity() <= 0 || !vault.contains(slot)) {
releaseSlot(inventoryDefault, slot);
} else
inventoryDefault.getSpigotInventory().setItem(slot, bagItem.getDisplayItemStack(player, this.plugin.getComponentMessage()));
}

protected void releaseSlot(InventoryEngine inventory, int slot) {
if (!isValidInventorySlot(slot)) {
return;
}
inventory.addItem(slot, new ItemStack(Material.AIR)).setClick(event -> event.setCancelled(true));
}

Expand Down Expand Up @@ -215,6 +226,10 @@ public void onDrag(InventoryDragEvent event, Player player, InventoryEngine inve
*/
private boolean isValidSlot(int slot, Player player) {

if (!isValidInventorySlot(slot)) {
return false;
}

int startSlot = getStartSlot(player);

if (startSlot > 0 && startSlot < this.slots.size()) {
Expand All @@ -223,6 +238,10 @@ private boolean isValidSlot(int slot, Player player) {
return true;
}

private boolean isValidInventorySlot(Integer slot) {
return slot != null && slot >= 0 && slot < this.slots.size();
}

/**
* Returns the start slot for the given player's target vault.
*
Expand Down