From 9a90bdf91aef474720c2e915b320600cba3078f5 Mon Sep 17 00:00:00 2001
From: Akkadius <akkadius1@gmail.com>
Date: Sun, 5 Apr 2020 18:40:19 -0500
Subject: [PATCH] Filter tradeskills [skip ci]

---
 world/world_server_command_handler.cpp | 2 +-
 zone/client_packet.cpp                 | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/world/world_server_command_handler.cpp b/world/world_server_command_handler.cpp
index 33fc10345..ec832271e 100644
--- a/world/world_server_command_handler.cpp
+++ b/world/world_server_command_handler.cpp
@@ -325,7 +325,7 @@ namespace WorldserverCommandHandler {
 			"Current expansion is [{}] ({}) is Velious Enabled [{}] Criteria [{}]",
 			content_service.GetCurrentExpansion(),
 			Expansion::ExpansionName[content_service.GetCurrentExpansion()],
-			content_service.IsTheShardsOfVeliousEnabled() ? "true" : "false",
+			content_service.IsTheScarsOfVeliousEnabled() ? "true" : "false",
 			ContentFilterCriteria::apply()
 		);
 	}
diff --git a/zone/client_packet.cpp b/zone/client_packet.cpp
index 048a80cc3..f4a53ad8b 100644
--- a/zone/client_packet.cpp
+++ b/zone/client_packet.cpp
@@ -61,6 +61,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #include "worldserver.h"
 #include "zone.h"
 #include "mob_movement_manager.h"
+#include "../common/repositories/criteria/content_filter_criteria.h"
 
 #ifdef BOTS
 #include "bot.h"
@@ -11850,6 +11851,7 @@ void Client::Handle_OP_RecipesFavorite(const EQApplicationPacket *app)
 			)
 				OR (tr.must_learn & 0x3 = 0)
 			)
+				%s
 				GROUP BY
 				tr.id
 				HAVING
@@ -11862,10 +11864,12 @@ void Client::Handle_OP_RecipesFavorite(const EQApplicationPacket *app)
 			)
 			) > 0
 				AND SUM(tre.componentcount) <= %u
+
 				LIMIT
 				100
 		),
 		favoriteIDs.c_str(),
+		ContentFilterCriteria::apply().c_str(),
 		containers.c_str(),
 		combineObjectSlots
 	);
@@ -11948,6 +11952,7 @@ void Client::Handle_OP_RecipesSearch(const EQApplicationPacket *app)
 					)
 				OR (tr.must_learn & 0x3 = 0)
 			)
+			{}
 				GROUP BY
 				tr.id
 				HAVING
@@ -11960,12 +11965,14 @@ void Client::Handle_OP_RecipesSearch(const EQApplicationPacket *app)
 			)
 			) > 0
 				AND SUM(tre.componentcount) <= {}
+
 				LIMIT
 				200
 		),
 		search_clause,
 		p_recipes_search_struct->mintrivial,
 		p_recipes_search_struct->maxtrivial,
+		ContentFilterCriteria::apply(),
 		containers_where_clause,
 		combine_object_slots
 	);