Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-02-09 05:52:52 +08:00
Code Issues Projects Releases Wiki Activity

Update classes to match protos

Browse Source
This commit is contained in:
Benj 2022-08-23 19:34:18 +08:00 committed by Luke H-W
parent d575d1ccea
commit c096d255fd
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/emu/grasscutter/game/battlepass/BattlePassManager.java
View File

@ -367,7 +367,7 @@ public class BattlePassManager extends BasePlayerDataManager {
.setEndTime(2059483200) .setEndTime(2059483200)
.setIsViewed(this.isViewed()) .setIsViewed(this.isViewed())
.setUnlockStatus(this.isPaid() ? BattlePassUnlockStatus.BATTLE_PASS_UNLOCK_STATUS_PAID : BattlePassUnlockStatus.BATTLE_PASS_UNLOCK_STATUS_FREE) .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()) .setCurCyclePoints(this.getCyclePoints())
.setCurCycle(BattlePassCycle.newBuilder() .setCurCycle(BattlePassCycle.newBuilder()
.setBeginTime(0) .setBeginTime(0)

3
src/main/java/emu/grasscutter/game/quest/GameMainQuest.java
View File

@ -346,7 +346,7 @@ public class GameMainQuest {
public void save() { public void save() {
DatabaseHelper.saveQuest(this); DatabaseHelper.saveQuest(this);
} }
public void delete() { public void delete() {
DatabaseHelper.deleteQuest(this); DatabaseHelper.deleteQuest(this);
} }
@ -356,7 +356,6 @@ public class GameMainQuest {
.setParentQuestId(getParentQuestId()) .setParentQuestId(getParentQuestId())
.setIsFinished(isFinished()); .setIsFinished(isFinished());
proto.setParentQuestState(getState().getValue()) proto.setParentQuestState(getState().getValue())
.setCutsceneEncryptionKey(QuestManager.getQuestKey(parentQuestId)); .setCutsceneEncryptionKey(QuestManager.getQuestKey(parentQuestId));
for (GameQuest quest : this.getChildQuests().values()) { for (GameQuest quest : this.getChildQuests().values()) {

10
src/main/java/emu/grasscutter/server/packet/recv/HandlerMusicGameSettleReq.java
View File

@ -26,7 +26,13 @@ public class HandlerMusicGameSettleReq extends PacketHandler {
var handler = (MusicGameActivityHandler) playerData.get().getActivityHandler(); var handler = (MusicGameActivityHandler) playerData.get().getActivityHandler();
boolean isNewRecord = false; boolean isNewRecord = false;
// check if custom beatmap // 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( session.getPlayer().getActivityManager().triggerWatcher(
WatcherTriggerType.TRIGGER_FLEUR_FAIR_MUSIC_GAME_REACH_SCORE, WatcherTriggerType.TRIGGER_FLEUR_FAIR_MUSIC_GAME_REACH_SCORE,
String.valueOf(req.getMusicBasicId()), 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));*/
} }
} }