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

Fix relics/lightcones not applying after switching paths

Browse Source
This commit is contained in:
Melledy
2024-07-30 23:58:53 -07:00
parent 57b0454866
commit 0af791d800
3 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/emu/lunarcore/game/avatar/GameAvatar.java
View File

@@ -243,20 +243,18 @@ public class GameAvatar implements GameEntity, IAvatar {
.setIsMarked(this.isMarked())
.setFirstMetTimestamp(this.getTimestamp());
if (!this.hasMultiPath()) {
for (var equip : this.getEquips().values()) {
if (equip.getItemMainType() == ItemMainType.Relic) {
proto.addEquipRelicList(EquipRelic.newInstance().setSlot(equip.getEquipSlot()).setRelicUniqueId(equip.getInternalUid()));
} else if (equip.getItemMainType() == ItemMainType.Equipment) {
proto.setEquipmentUniqueId(equip.getInternalUid());
}
}
for (var skill : getSkills().entrySet()) {
proto.addSkilltreeList(AvatarSkillTree.newInstance().setPointId(skill.getKey()).setLevel(skill.getValue()));
for (var equip : this.getEquips().values()) {
if (equip.getItemMainType() == ItemMainType.Relic) {
proto.addEquipRelicList(EquipRelic.newInstance().setSlot(equip.getEquipSlot()).setRelicUniqueId(equip.getInternalUid()));
} else if (equip.getItemMainType() == ItemMainType.Equipment) {
proto.setEquipmentUniqueId(equip.getInternalUid());
}
}
for (var skill : getSkills().entrySet()) {
proto.addSkilltreeList(AvatarSkillTree.newInstance().setPointId(skill.getKey()).setLevel(skill.getValue()));
}
for (int i = 0; i < this.getPromotion(); i++) {
if (this.hasTakenReward(i)) {
proto.addTakenRewards(i);

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

@@ -483,12 +483,8 @@ public class Player implements Tickable {
this.getCurAvatarPaths().put(excel.getBaseAvatarID(), pathId);
// Sync with client
this.sendPacket(new PacketPlayerSyncScNotify(path));
for (var item : avatar.getEquips().values()) {
this.sendPacket(new PacketPlayerSyncScNotify(item));
}
this.sendPacket(new PacketAvatarPathChangedNotify(avatar, path));
this.sendPacket(new PacketPlayerSyncScNotify(avatar));
// Success
return pathId;

2
src/main/java/emu/lunarcore/server/packet/send/PacketGetMultiPathAvatarInfoScRsp.java
View File

@@ -16,7 +16,6 @@ public class PacketGetMultiPathAvatarInfoScRsp extends BasePacket {
for (AvatarMultiPath path : player.getAvatars().getMultiPaths().values()) {
data.addMultiPathAvatarInfoList(path.toProto());
data.addBasicTypeIdList(path.getExcelId());
}
for (var entry : player.getCurAvatarPaths().entrySet()) {
@@ -25,6 +24,7 @@ public class PacketGetMultiPathAvatarInfoScRsp extends BasePacket {
.setValueValue(entry.getValue());
data.addCurAvatarPath(info);
data.addBasicTypeIdList(entry.getValue());
}
this.setData(data);