Skip to content

Commit 6f18be7

Browse files
authored
Merge branch 'develop' into feature/dungeon-ladders
2 parents 3f98586 + 416c6ff commit 6f18be7

File tree

3 files changed

+6
-8
lines changed

3 files changed

+6
-8
lines changed

package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,8 @@ export class ItemContainer {
160160
return { item: newItem, slot: existingItemIndex };
161161
} else {
162162
const newItemIndex = this.getFirstOpenSlot();
163-
if (newItemIndex === -1) {
164-
// Not enough container space
163+
if (newItemIndex === -1 || item.amount === 0) {
164+
// Not enough container space, or the amount of item being added is 0.
165165
return null;
166166
}
167167

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -170,9 +170,7 @@ export const withdrawItem: itemInteractionActionHandler = (details) => {
170170
amount: removeFromContainer(playerBank, details.itemId, countToRemove)
171171
};
172172

173-
for (let i = 0; i < itemToAdd.amount; i++) {
174-
playerInventory.add({ itemId: itemIdToAdd, amount: 1 });
175-
}
173+
playerInventory.add({ itemId: itemToAdd.itemId, amount: itemToAdd.amount });
176174

177175
updateBankingInterface(details.player);
178176
};

0 commit comments

Comments
 (0)