diff --git a/src/main/java/emu/grasscutter/game/battlepass/BattlePassManager.java b/src/main/java/emu/grasscutter/game/battlepass/BattlePassManager.java index 5be220cb0..97e3fcdb3 100644 --- a/src/main/java/emu/grasscutter/game/battlepass/BattlePassManager.java +++ b/src/main/java/emu/grasscutter/game/battlepass/BattlePassManager.java @@ -367,7 +367,7 @@ public class BattlePassManager extends BasePlayerDataManager { .setEndTime(2059483200) .setIsViewed(this.isViewed()) .setUnlockStatus(this.isPaid() ? BattlePassUnlockStatus.BATTLE_PASS_UNLOCK_STATUS_PAID : BattlePassUnlockStatus.BATTLE_PASS_UNLOCK_STATUS_FREE) - .setJPFMGBEBBBJ(2) // Not bought on Playstation. + .setUnk2700ODHAAHEPFAG(2) // Not bought on Playstation. .setCurCyclePoints(this.getCyclePoints()) .setCurCycle(BattlePassCycle.newBuilder() .setBeginTime(0) diff --git a/src/main/java/emu/grasscutter/game/quest/GameMainQuest.java b/src/main/java/emu/grasscutter/game/quest/GameMainQuest.java index 45aff59ee..00be8df18 100644 --- a/src/main/java/emu/grasscutter/game/quest/GameMainQuest.java +++ b/src/main/java/emu/grasscutter/game/quest/GameMainQuest.java @@ -346,7 +346,7 @@ public class GameMainQuest { public void save() { DatabaseHelper.saveQuest(this); } - + public void delete() { DatabaseHelper.deleteQuest(this); } @@ -356,7 +356,6 @@ public class GameMainQuest { .setParentQuestId(getParentQuestId()) .setIsFinished(isFinished()); - proto.setParentQuestState(getState().getValue()) .setCutsceneEncryptionKey(QuestManager.getQuestKey(parentQuestId)); for (GameQuest quest : this.getChildQuests().values()) { diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerMusicGameSettleReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerMusicGameSettleReq.java index b73a867e5..d57c03ff9 100644 --- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerMusicGameSettleReq.java +++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerMusicGameSettleReq.java @@ -26,7 +26,13 @@ public class HandlerMusicGameSettleReq extends PacketHandler { var handler = (MusicGameActivityHandler) playerData.get().getActivityHandler(); boolean isNewRecord = false; // check if custom beatmap - if(req.getMusicShareId() == 0){ + + // TODO: PROTO IS OBFUSCATED, NEED TO GET PROPER VALUES. + // Discovered: 23/08/2022. + // Probably was an issue in 2.8 but was discovered in 3.0 port. + // - Benj + + /*if(req.getMusicShareId() == 0){ session.getPlayer().getActivityManager().triggerWatcher( WatcherTriggerType.TRIGGER_FLEUR_FAIR_MUSIC_GAME_REACH_SCORE, String.valueOf(req.getMusicBasicId()), @@ -52,7 +58,7 @@ public class HandlerMusicGameSettleReq extends PacketHandler { } - session.send(new PacketMusicGameSettleRsp(req.getMusicBasicId(), req.getMusicShareId(), isNewRecord)); + session.send(new PacketMusicGameSettleRsp(req.getMusicBasicId(), req.getMusicShareId(), isNewRecord));*/ } }