diff --git a/src/main/java/emu/grasscutter/game/battlepass/BattlePassManager.java b/src/main/java/emu/grasscutter/game/battlepass/BattlePassManager.java index 049441728..167d5a027 100644 --- a/src/main/java/emu/grasscutter/game/battlepass/BattlePassManager.java +++ b/src/main/java/emu/grasscutter/game/battlepass/BattlePassManager.java @@ -12,6 +12,7 @@ import dev.morphia.annotations.Id; import dev.morphia.annotations.Indexed; import dev.morphia.annotations.Transient; import emu.grasscutter.GameConstants; +import emu.grasscutter.Grasscutter; import emu.grasscutter.data.GameData; import emu.grasscutter.data.common.ItemParamData; import emu.grasscutter.data.excels.BattlePassRewardData; @@ -44,7 +45,7 @@ public class BattlePassManager { @Getter private int level; @Getter private boolean viewed; - @Getter private boolean paid; + private boolean paid; private Map missions; private Map takenRewards; @@ -122,6 +123,11 @@ public class BattlePassManager { return getMissions().containsKey(id); } + public boolean isPaid() { + // ToDo: Change this when we actually support unlocking "paid" BP. + return true; + } + public Map getTakenRewards() { if (this.takenRewards == null) this.takenRewards = new HashMap<>(); return this.takenRewards; @@ -266,7 +272,8 @@ public class BattlePassManager { .setEndTime(2059483200) .setIsViewed(this.isViewed()) .setUnlockStatus(this.isPaid() ? BattlePassUnlockStatus.BATTLE_PASS_UNLOCK_STATUS_PAID : BattlePassUnlockStatus.BATTLE_PASS_UNLOCK_STATUS_FREE) - .setCurCyclePoints(this.getCyclePoints()) + .setJPFMGBEBBBJ(2) // Not bought on Playstation. + .setCurCyclePoints(this.getCyclePoints()) .setCurCycle(BattlePassCycle.newBuilder().setBeginTime(0).setEndTime(2059483200).setCycleIdx(3)); for (BattlePassReward reward : getTakenRewards().values()) {