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 lightcone/relic equipping

Browse Source
This commit is contained in:
Melledy
2024-05-08 02:21:43 -07:00
parent be766a4c43
commit 7c7dac0a69
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/emu/lunarcore/game/avatar/AvatarStorage.java
View File

@@ -32,6 +32,10 @@ public class AvatarStorage extends BasePlayerManager implements Iterable<GameAva
} }
public GameAvatar getAvatarById(int id) { public GameAvatar getAvatarById(int id) {
if (this.getHeroPaths().containsKey(id)) {
id = GameConstants.TRAILBLAZER_AVATAR_ID;
}
return getAvatars().get(id); return getAvatars().get(id);
} }

4
src/main/java/emu/lunarcore/game/inventory/GameItem.java
View File

@@ -280,6 +280,7 @@ public class GameItem {
.setIsProtected(this.isLocked()) .setIsProtected(this.isLocked())
.setIsDiscarded(this.isDiscarded()) .setIsDiscarded(this.isDiscarded())
.setBaseAvatarId(this.getEquipAvatar()) .setBaseAvatarId(this.getEquipAvatar())
.setEquipAvatarId(this.getEquipAvatar())
.setMainAffixId(this.mainAffix); .setMainAffixId(this.mainAffix);
if (this.subAffixes != null) { if (this.subAffixes != null) {
@@ -300,7 +301,8 @@ public class GameItem {
.setIsProtected(this.isLocked()) .setIsProtected(this.isLocked())
.setPromotion(this.getPromotion()) .setPromotion(this.getPromotion())
.setRank(this.getRank()) .setRank(this.getRank())
.setBaseAvatarId(this.getEquipAvatar()); .setBaseAvatarId(this.getEquipAvatar())
.setEquipAvatarId(this.getEquipAvatar());
return proto; return proto;
} }