pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-03-22 18:02:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Filter tradeskills [skip ci]

Browse Source
This commit is contained in:
Akkadius 2020-04-05 18:40:19 -05:00
parent 17e9198a58
commit 9a90bdf91a
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
world/world_server_command_handler.cpp
View File

@ -325,7 +325,7 @@ namespace WorldserverCommandHandler {
"Current expansion is [{}] ({}) is Velious Enabled [{}] Criteria [{}]", "Current expansion is [{}] ({}) is Velious Enabled [{}] Criteria [{}]",
content_service.GetCurrentExpansion(), content_service.GetCurrentExpansion(),
Expansion::ExpansionName[content_service.GetCurrentExpansion()], Expansion::ExpansionName[content_service.GetCurrentExpansion()],
content_service.IsTheShardsOfVeliousEnabled() ? "true" : "false", content_service.IsTheScarsOfVeliousEnabled() ? "true" : "false",
ContentFilterCriteria::apply() ContentFilterCriteria::apply()
); );
} }

7
zone/client_packet.cpp
View File

@ -61,6 +61,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "worldserver.h" #include "worldserver.h"
#include "zone.h" #include "zone.h"
#include "mob_movement_manager.h" #include "mob_movement_manager.h"
#include "../common/repositories/criteria/content_filter_criteria.h"
#ifdef BOTS #ifdef BOTS
#include "bot.h" #include "bot.h"
@ -11850,6 +11851,7 @@ void Client::Handle_OP_RecipesFavorite(const EQApplicationPacket *app)
) )
OR (tr.must_learn & 0x3 = 0) OR (tr.must_learn & 0x3 = 0)
) )
%s
GROUP BY GROUP BY
tr.id tr.id
HAVING HAVING
@ -11862,10 +11864,12 @@ void Client::Handle_OP_RecipesFavorite(const EQApplicationPacket *app)
) )
) > 0 ) > 0
AND SUM(tre.componentcount) <= %u AND SUM(tre.componentcount) <= %u
LIMIT LIMIT
100 100
), ),
favoriteIDs.c_str(), favoriteIDs.c_str(),
ContentFilterCriteria::apply().c_str(),
containers.c_str(), containers.c_str(),
combineObjectSlots combineObjectSlots
); );
@ -11948,6 +11952,7 @@ void Client::Handle_OP_RecipesSearch(const EQApplicationPacket *app)
) )
OR (tr.must_learn & 0x3 = 0) OR (tr.must_learn & 0x3 = 0)
) )
{}
GROUP BY GROUP BY
tr.id tr.id
HAVING HAVING
@ -11960,12 +11965,14 @@ void Client::Handle_OP_RecipesSearch(const EQApplicationPacket *app)
) )
) > 0 ) > 0
AND SUM(tre.componentcount) <= {} AND SUM(tre.componentcount) <= {}
LIMIT LIMIT
200 200
), ),
search_clause, search_clause,
p_recipes_search_struct->mintrivial, p_recipes_search_struct->mintrivial,
p_recipes_search_struct->maxtrivial, p_recipes_search_struct->maxtrivial,
ContentFilterCriteria::apply(),
containers_where_clause, containers_where_clause,
combine_object_slots combine_object_slots
); );