From 2c831ee1155f7d4e34592f1535d3402e2e0b5e9a Mon Sep 17 00:00:00 2001 From: Gent Date: Wed, 30 Sep 2020 16:23:46 -0400 Subject: [PATCH] Match maxed stack behavior to OG --- src/ItemManager.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ItemManager.cpp b/src/ItemManager.cpp index bec937e..3a8ffc5 100644 --- a/src/ItemManager.cpp +++ b/src/ItemManager.cpp @@ -100,8 +100,8 @@ void ItemManager::itemMoveHandler(CNSocket* sock, CNPacketData* data) { // swap/stack items in session Item* itemDat = getItemData(toItem->iID, toItem->iType); - if (itemDat->stackSize > 1 && itemDat == getItemData(fromItem->iID, fromItem->iType)) { - // items are stackable and identical, so run stacking logic + if (itemDat->stackSize > 1 && itemDat == getItemData(fromItem->iID, fromItem->iType) && fromItem->iOpt < itemDat->stackSize && toItem->iOpt < itemDat->stackSize) { + // items are stackable, identical, and not maxed, so run stacking logic toItem->iOpt += fromItem->iOpt; // sum counts fromItem->iOpt = 0; // deplete from item