From b60efbc8b39f93f04643d0fc05ff88cfccae489b Mon Sep 17 00:00:00 2001
From: Krakenied <krakenied1@gmail.com>
Date: Sat, 16 Nov 2024 02:34:28 +0100
Subject: Make the counts towards completed option actually usable That entire
 placeholder mess needs to be rewritten though

---
 .../com/leonardobishop/quests/bukkit/hook/papi/QuestsPlaceholders.java  | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'bukkit')

diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/hook/papi/QuestsPlaceholders.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/hook/papi/QuestsPlaceholders.java
index 7c988cba..1a533aab 100644
--- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/hook/papi/QuestsPlaceholders.java
+++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/hook/papi/QuestsPlaceholders.java
@@ -88,11 +88,13 @@ public class QuestsPlaceholders extends PlaceholderExpansion implements Cacheabl
                 case "completed":
                 case "c":
                     final List<Quest> listCompleted = qPlayer.getQuestProgressFile().getAllQuestsFromProgress(QuestProgressFile.QuestsProgressFilter.COMPLETED);
+                    listCompleted.removeIf(quest -> !quest.doesCountTowardsCompleted());
                     result = (args.length == 1 ? String.valueOf(listCompleted.size()) : parseList(listCompleted, args[1], split));
                     break;
                 case "completedbefore":
                 case "cb":
                     final List<Quest> listCompletedB = qPlayer.getQuestProgressFile().getAllQuestsFromProgress(QuestProgressFile.QuestsProgressFilter.COMPLETED_BEFORE);
+                    listCompletedB.removeIf(quest -> !quest.doesCountTowardsCompleted());
                     result = (args.length == 1 ? String.valueOf(listCompletedB.size()) : parseList(listCompletedB, args[1], split));
                     break;
                 case "started":
-- 
cgit v1.2.3-70-g09d2