Commit 0cbfcdda authored by Yazawazi's avatar Yazawazi Committed by GitHub
Browse files

Should be OK

parent 02ce6242
...@@ -853,15 +853,35 @@ public class Player { ...@@ -853,15 +853,35 @@ public class Player {
public SocialDetail.Builder getSocialDetail() { public SocialDetail.Builder getSocialDetail() {
List<SocialShowAvatarInfoOuterClass.SocialShowAvatarInfo> socialShowAvatarInfoList = new ArrayList<>(); List<SocialShowAvatarInfoOuterClass.SocialShowAvatarInfo> socialShowAvatarInfoList = new ArrayList<>();
for (int avatarId : this.getShowAvatarList()) { if (this.isOnline()) {
socialShowAvatarInfoList.add( if (this.getShowAvatarList() != null) {
socialShowAvatarInfoList.size(), for (int avatarId : this.getShowAvatarList()) {
SocialShowAvatarInfoOuterClass.SocialShowAvatarInfo.newBuilder() socialShowAvatarInfoList.add(
.setAvatarId(avatarId) socialShowAvatarInfoList.size(),
.setLevel(getAvatars().getAvatarById(avatarId).getLevel()) SocialShowAvatarInfoOuterClass.SocialShowAvatarInfo.newBuilder()
.setCostumeId(getAvatars().getAvatarById(avatarId).getCostume()) .setAvatarId(avatarId)
.build() .setLevel(getAvatars().getAvatarById(avatarId).getLevel())
); .setCostumeId(getAvatars().getAvatarById(avatarId).getCostume())
.build()
);
}
}
} else {
List<Integer> showAvatarList = DatabaseHelper.getPlayerById(id).getShowAvatarList();
AvatarStorage avatars = DatabaseHelper.getPlayerById(id).getAvatars();
avatars.loadFromDatabase();
if (showAvatarList != null) {
for (int avatarId : showAvatarList) {
socialShowAvatarInfoList.add(
socialShowAvatarInfoList.size(),
SocialShowAvatarInfoOuterClass.SocialShowAvatarInfo.newBuilder()
.setAvatarId(avatarId)
.setLevel(avatars.getAvatarById(avatarId).getLevel())
.setCostumeId(avatars.getAvatarById(avatarId).getCostume())
.build()
);
}
}
} }
SocialDetail.Builder social = SocialDetail.newBuilder() SocialDetail.Builder social = SocialDetail.newBuilder()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment