From 68a2af1bcedfca025b0d0d6a118cff91bbcd4531 Mon Sep 17 00:00:00 2001 From: Akkadius Date: Sun, 5 Apr 2020 19:37:00 -0500 Subject: [PATCH] Filter forage [skip ci] --- zone/forage.cpp | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/zone/forage.cpp b/zone/forage.cpp index 56456bd36..6d24f50a8 100644 --- a/zone/forage.cpp +++ b/zone/forage.cpp @@ -55,9 +55,25 @@ uint32 ZoneDatabase::GetZoneForage(uint32 ZoneID, uint8 skill) { } uint32 chancepool = 0; - std::string query = StringFormat("SELECT itemid, chance FROM " - "forage WHERE zoneid = '%i' and level <= '%i' " - "LIMIT %i", ZoneID, skill, FORAGE_ITEM_LIMIT); + std::string query = fmt::format( + SQL( + SELECT + itemid, + chance + FROM + forage + WHERE + zoneid = '{}' + and level <= '{}' + {} + LIMIT + {} + ), + ZoneID, + skill, + ContentFilterCriteria::apply(), + FORAGE_ITEM_LIMIT + ); auto results = QueryDatabase(query); if (!results.Success()) { return 0;