yuriy/2009scape
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed bug preventing deposit of noted items already present in bank when bank is full

Browse Source
This commit is contained in:
vddcore
2022-10-22 15:19:49 +00:00
committed by Ryan
parent 82f7d0663b
commit 6096fca708
1 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Server/src/main/java/core/game/container/impl/BankContainer.java
+17 -11
View File
@@ -210,11 +210,26 @@ public final class BankContainer extends Container {
if (item == null) { if (item == null) {
return; return;
} }
if (!item.getDefinition().getConfiguration(ItemConfigParser.BANKABLE, true)) {
player.sendMessage("A magical force prevents you from banking this item");
return;
}
int maximum = player.getInventory().getAmount(item); int maximum = player.getInventory().getAmount(item);
if (amount > maximum) { if (amount > maximum) {
amount = maximum; amount = maximum;
} }
int maxCount = super.getMaximumAdd(item);
item = new Item(item.getId(), amount, item.getCharge());
boolean unnote = !item.getDefinition().isUnnoted();
Item add = unnote ? new Item(item.getDefinition().getNoteId(), amount, item.getCharge()) : item;
if (unnote && !add.getDefinition().isUnnoted()) {
add = item;
}
int maxCount = super.getMaximumAdd(add);
if (amount > maxCount) { if (amount > maxCount) {
amount = maxCount; amount = maxCount;
if (amount < 1) { if (amount < 1) {
@@ -222,17 +237,8 @@ public final class BankContainer extends Container {
return; return;
} }
} }
if (!item.getDefinition().getConfiguration(ItemConfigParser.BANKABLE, true)) {
player.sendMessage("A magical force prevents you from banking this item");
return;
}
item = new Item(item.getId(), amount, item.getCharge());
boolean unnote = !item.getDefinition().isUnnoted();
if (player.getInventory().remove(item, slot, true)) { if (player.getInventory().remove(item, slot, true)) {
Item add = unnote ? new Item(item.getDefinition().getNoteId(), amount, item.getCharge()) : item;
if (unnote && !add.getDefinition().isUnnoted()) {
add = item;
}
int preferredSlot = -1; int preferredSlot = -1;
if (tabIndex != 0 && tabIndex != 10 && !super.contains(add.getId(), 1)) { if (tabIndex != 0 && tabIndex != 10 && !super.contains(add.getId(), 1)) {
preferredSlot = tabStartSlot[tabIndex] + getItemsInTab(tabIndex); preferredSlot = tabStartSlot[tabIndex] + getItemsInTab(tabIndex);