From 5f851a036706a65cb4490000ca607d852f50472c Mon Sep 17 00:00:00 2001
From: Melledy <121644117+Melledy@users.noreply.github.com>
Date: Mon, 17 Nov 2025 08:19:56 -0800
Subject: [PATCH] Allow battle pass weeklies to be reset

---
 src/main/java/emu/nebula/game/battlepass/BattlePass.java | 4 ++--
 src/main/java/emu/nebula/game/player/Player.java         | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/emu/nebula/game/battlepass/BattlePass.java b/src/main/java/emu/nebula/game/battlepass/BattlePass.java
index 627112a..29f286c 100644
--- a/src/main/java/emu/nebula/game/battlepass/BattlePass.java
+++ b/src/main/java/emu/nebula/game/battlepass/BattlePass.java
@@ -101,14 +101,14 @@ public class BattlePass implements GameDatabaseObject {
         }
     }
     
-    public synchronized void resetDailyQuests() {
+    public synchronized void resetDailyQuests(boolean resetWeekly) {
         // Reset daily quests
         for (var data : GameData.getBattlePassQuestDataTable()) {
             // Get quest
             var quest = getQuests().computeIfAbsent(data.getId(), i -> new GameQuest(data));
             
             // Don't reset weekly quests
-            if (!data.isDaily()) {
+            if (!data.isDaily() && !resetWeekly) {
                 continue;
             }
             
diff --git a/src/main/java/emu/nebula/game/player/Player.java b/src/main/java/emu/nebula/game/player/Player.java
index ff4cfca..24c8493 100644
--- a/src/main/java/emu/nebula/game/player/Player.java
+++ b/src/main/java/emu/nebula/game/player/Player.java
@@ -534,17 +534,17 @@ public class Player implements GameDatabaseObject {
         }
         
         // Reset dailies
-        this.resetDailies();
+        this.resetDailies(false);
         
         // Update last epoch day
         this.lastEpochDay = Nebula.getGameContext().getEpochDays();
         Nebula.getGameDatabase().update(this, this.getUid(), "lastEpochDay", this.lastEpochDay);
     }
 
-    public void resetDailies() {
+    public void resetDailies(boolean resetWeekly) {
         // Reset daily quests
         this.getQuestManager().resetDailyQuests();
-        this.getBattlePassManager().getBattlePass().resetDailyQuests();
+        this.getBattlePassManager().getBattlePass().resetDailyQuests(resetWeekly);
     }
     
     // Trigger quests