Merge remote-tracking branch 'origin/development' into development

This commit is contained in:
KingRainbow44
2023-08-13 16:20:11 -04:00
Unverified
31 changed files with 376 additions and 75 deletions
@@ -282,7 +282,7 @@ public class QuestManager extends BasePlayerManager {
}
public GameMainQuest getMainQuestByTalkId(int talkId) {
int mainQuestId = GameData.getQuestTalkMap().getOrDefault(talkId, talkId / 100);
var mainQuestId = GameData.getQuestTalkMap().getOrDefault(talkId, 0);
return getMainQuestById(mainQuestId);
}