Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
ziqian zhang
Grasscutter
Commits
c096d255
Commit
c096d255
authored
Aug 23, 2022
by
Benj
Committed by
Luke H-W
Aug 24, 2022
Browse files
Update classes to match protos
parent
d575d1cc
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/main/java/emu/grasscutter/game/battlepass/BattlePassManager.java
View file @
c096d255
...
...
@@ -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
)
.
set
JPFMGBEBBBJ
(
2
)
// Not bought on Playstation.
.
set
Unk2700ODHAAHEPFAG
(
2
)
// Not bought on Playstation.
.
setCurCyclePoints
(
this
.
getCyclePoints
())
.
setCurCycle
(
BattlePassCycle
.
newBuilder
()
.
setBeginTime
(
0
)
...
...
src/main/java/emu/grasscutter/game/quest/GameMainQuest.java
View file @
c096d255
...
...
@@ -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
())
{
...
...
src/main/java/emu/grasscutter/server/packet/recv/HandlerMusicGameSettleReq.java
View file @
c096d255
...
...
@@ -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));
*/
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment