Skip to content

fix: remove correct amount of required items for bank upgrade #28

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

Open
atilapan wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: remove correct amount of required items for bank upgrade #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f2c9789
fix: remove correct amount of required items for bank upgrade
atilapan Mar 30, 2026
a091036
fix: optimize and add custom items compatability
atilapan Apr 17, 2026
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
13 changes: 11 additions & 2 deletions src/main/java/me/pulsi_/bankplus/bankSystem/BankUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.PlayerInventory;
import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.persistence.PersistentDataContainer;
import org.bukkit.persistence.PersistentDataType;
Expand Down Expand Up @@ -514,8 +515,16 @@ public static void upgradeBank(Bank bank, Player p) {
vaultEconomy.withdrawPlayer(p, cost.doubleValue());
}

if (isRemovingRequiredItems(bank, nextLevel) && canRemoveSafely)
for (Bank.RequiredItem requiredItem : requiredItems) p.getInventory().removeItem(requiredItem.item);
if (isRemovingRequiredItems(bank, nextLevel) && canRemoveSafely) {
PlayerInventory inventory = p.getInventory();

for (Bank.RequiredItem requiredItem : requiredItems) {
ItemStack item = requiredItem.item.clone();
item.setAmount(requiredItem.amount);

inventory.removeItem(item);
}
}

setLevel(bank, p, nextLevel);
BPMessages.sendIdentifier(p, "Bank-Upgraded");
Expand Down
17 changes: 16 additions & 1 deletion src/main/java/me/pulsi_/bankplus/commands/list/GiveRequiredItemsCmd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.PlayerInventory;
import org.jetbrains.annotations.NotNull;

import java.util.*;

Expand Down Expand Up @@ -110,7 +112,20 @@ public BPCmdExecution onExecution(CommandSender s, String[] args) {
return new BPCmdExecution() {
@Override
public void execute() {
for (Bank.RequiredItem requiredItem : givenItems) target.getInventory().addItem(requiredItem.item);
PlayerInventory inventory = target.getInventory();

for (Bank.RequiredItem requiredItem : givenItems) {
ItemStack item = requiredItem.item.clone();
item.setAmount(requiredItem.amount);

HashMap<Integer, ItemStack> leftover = inventory.addItem(item);

if (!leftover.isEmpty()) {
leftover.values().forEach(stack ->
target.getWorld().dropItemNaturally(target.getLocation(), stack)
);
}
}
}
};
}
Expand Down