diff --git a/changelog.txt b/changelog.txt index fe9e68c29..e8511f6b6 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,5 +1,8 @@ EQEMu Changelog (Started on Sept 24, 2003 15:50) ------------------------------------------------------- +== 10/05/2013 == +Sorvani: fixed issue with stackable items being created with 0 charges cause by fix to SummonItems + == 10/03/2013 == demonstar55: Fix when the random +1 tick is added to nerf extension focus effects to where they should be diff --git a/zone/inventory.cpp b/zone/inventory.cpp index 5b9147c7f..eb38388d9 100644 --- a/zone/inventory.cpp +++ b/zone/inventory.cpp @@ -207,13 +207,14 @@ void Client::SummonItem(uint32 item_id, int16 charges, uint32 aug1, uint32 aug2, Message(0, "No such item: %i", item_id); return; } else { - // if 0 and max charges 0 and stackable, set the created item charge to 1 - if (charges == 0 && item->MaxCharges == 0 && item->Stackable) { + // if the item is stackable and the charge amount is -1 or 0 then set to 1 charge. + // removed && item->MaxCharges == 0 if -1 or 0 was passed max charges is irrelevant + if (charges <= 0 && item->Stackable) { charges = 1; // if the charges is -1, then no charge value was passed in set to max charges } else if(charges == -1) { charges = item->MaxCharges; - // in any other situatino just use charges as passed + // in any other situation just use charges as passed } } // Checking to see if the Item is lore or not.