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

Merge pull request #702 from daerath/BugFix/RecipesIgnoreContainerSize

Browse Source 
Bug fix/recipes ignore container size
This commit is contained in:
Chris Miles 2018-02-02 13:15:24 -06:00 committed by GitHub
commit 80ad3a8940
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
zone/client_packet.cpp
View File

@ -11690,10 +11690,24 @@ void Client::Handle_OP_RecipesFavorite(const EQApplicationPacket *app)
// make where clause segment for container(s) // make where clause segment for container(s)
std::string containers; std::string containers;
if (tsf->some_id == 0) uint32 combineObjectSlots;
if (tsf->some_id == 0) {
containers += StringFormat(" = %u ", tsf->object_type); // world combiner so no item number containers += StringFormat(" = %u ", tsf->object_type); // world combiner so no item number
else combineObjectSlots = 10;
}
else {
containers += StringFormat(" in (%u, %u) ", tsf->object_type, tsf->some_id); // container in inventory containers += StringFormat(" in (%u, %u) ", tsf->object_type, tsf->some_id); // container in inventory
auto item = database.GetItem(tsf->some_id);
if (!item)
{
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 std::string favoriteIDs; //gotta be big enough for 500 IDs
bool first = true; bool first = true;
@ -11725,8 +11739,8 @@ void Client::Handle_OP_RecipesFavorite(const EQApplicationPacket *app)
"((tr.must_learn & 0x3 <> 0 AND crl.madecount IS NOT NULL) " "((tr.must_learn & 0x3 <> 0 AND crl.madecount IS NOT NULL) "
"OR (tr.must_learn & 0x3 = 0)) " "OR (tr.must_learn & 0x3 = 0)) "
"GROUP BY tr.id " "GROUP BY tr.id "
"HAVING sum(if(tre.item_id %s AND tre.iscontainer > 0,1,0)) > 0 " "HAVING sum(if(tre.item_id %s AND tre.iscontainer > 0,1,0)) > 0 AND SUM(tre.componentcount) <= %u "
"LIMIT 100 ", CharacterID(), favoriteIDs.c_str(), containers.c_str()); "LIMIT 100 ", CharacterID(), favoriteIDs.c_str(), containers.c_str(), combineObjectSlots);
TradeskillSearchResults(query, tsf->object_type, tsf->some_id); TradeskillSearchResults(query, tsf->object_type, tsf->some_id);
return; return;
@ -11748,13 +11762,25 @@ void Client::Handle_OP_RecipesSearch(const EQApplicationPacket *app)
// make where clause segment for container(s) // make where clause segment for container(s)
char containers[30]; char containers[30];
uint32 combineObjectSlots;
if (rss->some_id == 0) { if (rss->some_id == 0) {
// world combiner so no item number // world combiner so no item number
snprintf(containers, 29, "= %u", rss->object_type); snprintf(containers, 29, "= %u", rss->object_type);
combineObjectSlots = 10;
} }
else { else {
// container in inventory // container in inventory
snprintf(containers, 29, "in (%u,%u)", rss->object_type, rss->some_id); snprintf(containers, 29, "in (%u,%u)", rss->object_type, rss->some_id);
auto item = database.GetItem(rss->some_id);
if (!item)
{
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; std::string searchClause;
@ -11779,10 +11805,10 @@ void Client::Handle_OP_RecipesSearch(const EQApplicationPacket *app)
"AND crl.madecount IS NOT NULL) " "AND crl.madecount IS NOT NULL) "
"OR (tr.must_learn & 0x3 = 0)) " "OR (tr.must_learn & 0x3 = 0)) "
"GROUP BY tr.id " "GROUP BY tr.id "
"HAVING sum(if(tre.item_id %s AND tre.iscontainer > 0,1,0)) > 0 " "HAVING sum(if(tre.item_id %s AND tre.iscontainer > 0,1,0)) > 0 AND SUM(tre.componentcount) <= %u "
"LIMIT 200 ", "LIMIT 200 ",
CharacterID(), searchClause.c_str(), CharacterID(), searchClause.c_str(),
rss->mintrivial, rss->maxtrivial, containers); rss->mintrivial, rss->maxtrivial, containers, combineObjectSlots);
TradeskillSearchResults(query, rss->object_type, rss->some_id); TradeskillSearchResults(query, rss->object_type, rss->some_id);
return; return;
} }