Merge branch 'develop' into items

Author: SchauweM

src/engine/world/items/item-container.ts

@@ -4,6 +4,7 @@ import { filestore } from '@server/game/game-server';
 import { hasValueNotNull } from '@engine/util/data';
 import { findItem } from '@engine/config/config-handler';
 import { logger } from '@runejs/core';
+import { fromNote } from '@engine/world/items/item';
 
 
 export interface ContainerUpdateEvent {
@@ -308,7 +309,7 @@ export class ItemContainer {
         if(!itemDefinition) {
             throw new Error(`Item ID ${ item.itemId } not found!`);
         }
-        if(itemDefinition.stackable || everythingStacks) {
+        if(itemDefinition.stackable || everythingStacks || fromNote(item) > -1) {
             if(this.has(item.itemId)) {
                 const invItem = this.items[this.findIndex(item.itemId)];
                 return invItem.amount + item.amount <= 2147483647;

src/plugins/objects/bank/bank.plugin.ts

@@ -114,10 +114,12 @@ export const withdrawItem: itemInteractionActionHandler = (details) => {
     }
 
     let itemIdToAdd: number = details.itemId;
+    let stackable: boolean = details.itemDetails.stackable;
     if (details.player.settings.bankWithdrawNoteMode) {
         const toNoteId: number = toNote(details.itemId);
         if (toNoteId > -1) {
             itemIdToAdd = toNoteId;
+            stackable = true;
         } else {
             details.player.sendMessage('This item can not be withdrawn as a note.');
         }
@@ -154,7 +156,7 @@ export const withdrawItem: itemInteractionActionHandler = (details) => {
         countToRemove = itemAmount;
     }
 
-    if (!details.itemDetails.stackable) {
+    if (!stackable) {
         const slots = playerInventory.getOpenSlotCount();
         if (slots < countToRemove) {
             countToRemove = slots;
@@ -170,7 +172,13 @@ export const withdrawItem: itemInteractionActionHandler = (details) => {
         amount: removeFromContainer(playerBank, details.itemId, countToRemove)
     };
 
-    playerInventory.add({ itemId: itemToAdd.itemId, amount: itemToAdd.amount });
+    if (stackable) {
+        playerInventory.add({ itemId: itemToAdd.itemId, amount: itemToAdd.amount });
+    } else {
+        for(let count = 0; count < itemToAdd.amount; count++) {
+            playerInventory.add({ itemId: itemToAdd.itemId, amount: 1 });
+        }
+    }
 
     updateBankingInterface(details.player);
 };