pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-12 17:51:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Daerath 2018-01-21 17:28:27 -05:00
parent 518a5e8ab1
commit fbe456ed45
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
zone/client_packet.cpp
View File

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