Skip to content

Commit b6e7d69

Browse files
authored
Send QUEST_COND_NONE on every login (#2386)
For players that enabled questing late
1 parent 5faf39d commit b6e7d69

File tree

3 files changed

+1
-13
lines changed

3 files changed

+1
-13
lines changed

src/main/java/emu/grasscutter/game/player/Player.java

-8
Original file line numberDiff line numberDiff line change
@@ -1378,14 +1378,6 @@ public void loadFromDatabase() {
13781378
this.getPlayerProgress().setPlayer(this); // Add reference to the player.
13791379
}
13801380

1381-
/**
1382-
* Invoked when the player selects their avatar.
1383-
*/
1384-
public void onPlayerBorn() {
1385-
Grasscutter.getThreadPool().submit(
1386-
this.getQuestManager()::onPlayerBorn);
1387-
}
1388-
13891381
public void onLogin() {
13901382
// Quest - Commented out because a problem is caused if you log out while this quest is active
13911383
/*

src/main/java/emu/grasscutter/game/quest/QuestManager.java

+1-4
Original file line numberDiff line numberDiff line change
@@ -221,14 +221,11 @@ public void sendGivingRecords() {
221221
this.player.sendPacket(new PacketGivingRecordNotify(this.getGivingRecords()));
222222
}
223223

224-
public void onPlayerBorn() {
224+
public void onLogin() {
225225
if (this.isQuestingEnabled()) {
226226
this.enableQuests();
227227
this.sendGivingRecords();
228228
}
229-
}
230-
231-
public void onLogin() {
232229

233230
List<GameMainQuest> activeQuests = getActiveMainQuests();
234231
List<GameQuest> activeSubs = new ArrayList<>(activeQuests.size());

src/main/java/emu/grasscutter/server/packet/recv/HandlerSetPlayerBornDataReq.java

-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ public void handle(GameSession session, byte[] header, byte[] payload) throws Ex
6969

7070
// Login done
7171
session.getPlayer().onLogin();
72-
session.getPlayer().onPlayerBorn();
7372

7473
// Born resp packet
7574
session.send(new BasePacket(PacketOpcodes.SetPlayerBornDataRsp));

0 commit comments

Comments
 (0)