From be307fe5f0b4161b9478b8471985e57fb508798d Mon Sep 17 00:00:00 2001 From: Melledy <52122272+Melledy@users.noreply.github.com> Date: Tue, 26 Apr 2022 19:20:10 -0700 Subject: [PATCH] Fix white screen after logging in --- proto/AvatarDataNotify.proto | 2 +- src/main/java/emu/grasscutter/game/GenshinPlayer.java | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/proto/AvatarDataNotify.proto b/proto/AvatarDataNotify.proto index 8f0a51426..dd93c8c35 100755 --- a/proto/AvatarDataNotify.proto +++ b/proto/AvatarDataNotify.proto @@ -17,7 +17,7 @@ message AvatarDataNotify { repeated AvatarInfo avatar_list = 1; map avatar_team_map = 2; uint32 cur_avatar_team_id = 3; - uint64 choose_avatar_guid = 4; + fixed64 choose_avatar_guid = 4; repeated uint64 temp_avatar_guid_list = 5; repeated uint32 owned_flycloak_list = 6; repeated uint32 owned_costume_list = 7; diff --git a/src/main/java/emu/grasscutter/game/GenshinPlayer.java b/src/main/java/emu/grasscutter/game/GenshinPlayer.java index 490a8dbdc..9df81955b 100644 --- a/src/main/java/emu/grasscutter/game/GenshinPlayer.java +++ b/src/main/java/emu/grasscutter/game/GenshinPlayer.java @@ -76,7 +76,6 @@ public class GenshinPlayer { private TeamManager teamManager; private PlayerGachaInfo gachaInfo; private PlayerProfile playerProfile; - private MpSettingType mpSetting = MpSettingType.MP_SETTING_ENTER_AFTER_APPLY; private boolean showAvatar; private ArrayList shownAvatars; private Set rewardedLevels; @@ -381,7 +380,7 @@ public class GenshinPlayer { } public MpSettingType getMpSetting() { - return mpSetting; + return MpSettingType.MP_SETTING_ENTER_AFTER_APPLY; // TEMP } public synchronized Int2ObjectMap getCoopRequests() { @@ -400,10 +399,6 @@ public class GenshinPlayer { return clientAbilityInitFinishHandler; } - public void setMpSetting(MpSettingType mpSetting) { - this.mpSetting = mpSetting; - } - public AvatarStorage getAvatars() { return avatars; }