Mirror/LunarCore
1
0
Fork 0
mirror of https://github.com/Melledy/LunarCore.git synced 2025-12-13 05:44:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix error if logging in with a broken lineup

Browse Source
This commit is contained in:
Melledy
2024-05-19 10:25:04 -07:00
parent dca4a211f3
commit 4a96becdf0
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/emu/lunarcore/game/player/Player.java
View File

@@ -901,6 +901,17 @@ public class Player implements Tickable {
this.enterScene(GameConstants.START_ENTRY_ID, 0, false); this.enterScene(GameConstants.START_ENTRY_ID, 0, false);
} }
// Make sure the current lineup's leader exists
var lineup = this.getCurrentLineup();
if (lineup.size() == 0) {
lineup.getAvatars().add(GameConstants.TRAILBLAZER_AVATAR_ID);
lineup.setLeader(0);
lineup.save();
} else if (lineup.getLeader() >= lineup.size()) {
lineup.setLeader(0);
lineup.save();
}
// Sanity check lineup to prevent the player from getting stuck in a loading screen if they loaded into the game with an avatar that had 0 hp // Sanity check lineup to prevent the player from getting stuck in a loading screen if they loaded into the game with an avatar that had 0 hp
var leader = this.getCurrentLeaderAvatar(); var leader = this.getCurrentLeaderAvatar();
if (leader != null && leader.getCurrentHp(this.getCurrentLineup()) <= 0) { if (leader != null && leader.getCurrentHp(this.getCurrentLineup()) <= 0) {