mirror of
https://github.com/EQEmu/Server.git
synced 2026-04-17 23:12:27 +00:00
Fix for tradeskill query [skip ci]
This commit is contained in:
parent
58534dea16
commit
bcef171cf9
@ -11828,6 +11828,7 @@ void Client::Handle_OP_RecipesFavorite(const EQApplicationPacket *app)
|
||||
if (first) //no favorites....
|
||||
return;
|
||||
|
||||
// TODO: Clean this up
|
||||
const std::string query = StringFormat(
|
||||
SQL (
|
||||
SELECT
|
||||
@ -11924,6 +11925,7 @@ void Client::Handle_OP_RecipesSearch(const EQApplicationPacket *app)
|
||||
}
|
||||
|
||||
//arbitrary limit of 200 recipes, makes sense to me.
|
||||
// TODO: Clean this up
|
||||
std::string query = fmt::format(
|
||||
SQL(
|
||||
SELECT
|
||||
@ -11931,27 +11933,10 @@ void Client::Handle_OP_RecipesSearch(const EQApplicationPacket *app)
|
||||
tr.name,
|
||||
tr.trivial,
|
||||
SUM(tre.componentcount),
|
||||
crl.madecount,
|
||||
tr.tradeskill
|
||||
FROM
|
||||
tradeskill_recipe
|
||||
AS tr
|
||||
LEFT
|
||||
JOIN
|
||||
tradeskill_recipe_entries
|
||||
AS
|
||||
tre
|
||||
ON
|
||||
tr.id = tre.recipe_id
|
||||
LEFT JOIN(
|
||||
SELECT
|
||||
recipe_id,
|
||||
madecount
|
||||
FROM
|
||||
char_recipe_list
|
||||
WHERE
|
||||
char_id = {}
|
||||
) AS crl ON tr.id = crl.recipe_id
|
||||
tradeskill_recipe AS tr
|
||||
LEFT JOIN tradeskill_recipe_entries AS tre ON tr.id = tre.recipe_id
|
||||
WHERE
|
||||
{} tr.trivial >= {}
|
||||
AND tr.trivial <= {}
|
||||
@ -11960,7 +11945,6 @@ void Client::Handle_OP_RecipesSearch(const EQApplicationPacket *app)
|
||||
AND (
|
||||
(
|
||||
tr.must_learn & 0x3 <> 0
|
||||
AND crl.madecount IS NOT NULL
|
||||
)
|
||||
OR (tr.must_learn & 0x3 = 0)
|
||||
)
|
||||
@ -11979,7 +11963,6 @@ void Client::Handle_OP_RecipesSearch(const EQApplicationPacket *app)
|
||||
LIMIT
|
||||
200
|
||||
),
|
||||
CharacterID(),
|
||||
search_clause,
|
||||
p_recipes_search_struct->mintrivial,
|
||||
p_recipes_search_struct->maxtrivial,
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user