* If GetItem returns null when searching for a container item, we now default bagslots to 10 instead of aborting.

This commit is contained in:
Daerath 2018-01-21 17:28:27 -05:00
parent 518a5e8ab1
commit fbe456ed45

View File

@ -11700,12 +11700,14 @@ void Client::Handle_OP_RecipesFavorite(const EQApplicationPacket *app)
auto item = database.GetItem(tsf->some_id);
if (!item)
{
Log(Logs::General, Logs::Error, "Invalid container ID: %d. GetItem returned null.\n", tsf->some_id);
return;
Log(Logs::General, Logs::Error, "Invalid container ID: %d. GetItem returned null. Defaulting to BagSlots = 10.\n", tsf->some_id);
combineObjectSlots = 10;
}
else
{
combineObjectSlots = item->BagSlots;
}
}
std::string favoriteIDs; //gotta be big enough for 500 IDs
bool first = true;
@ -11772,12 +11774,14 @@ void Client::Handle_OP_RecipesSearch(const EQApplicationPacket *app)
auto item = database.GetItem(rss->some_id);
if (!item)
{
Log(Logs::General, Logs::Error, "Invalid container ID: %d. GetItem returned null.\n", rss->some_id);
return;
Log(Logs::General, Logs::Error, "Invalid container ID: %d. GetItem returned null. Defaulting to BagSlots = 10.\n", rss->some_id);
combineObjectSlots = 10;
}
else
{
combineObjectSlots = item->BagSlots;
}
}
std::string searchClause;