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

Quick fix for PacketGetArchiveDataScRsp

Browse Source
This commit is contained in:
Melledy
2024-02-05 22:57:06 -08:00
parent a47363a7c8
commit 0058166aa8
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/emu/lunarcore/data/GameData.java
View File

@@ -104,14 +104,7 @@ public class GameData {
}
public static List<Integer> getAllRelicIds() {
List<Integer> allIds = new ArrayList<>();
for (Int2ObjectMap.Entry<RelicExcel> entry : relicExcelMap.int2ObjectEntrySet()) {
RelicExcel relicExcel = entry.getValue();
allIds.add(relicExcel.getId());
}
return allIds;
return relicExcelMap.values().stream().map(RelicExcel::getId).toList();
}
public static int getRelicSetFromId(int relicId) {
@@ -120,6 +113,7 @@ public class GameData {
if (relicExcel == null) {
return 0;
}
return relicExcel.getSetId();
}

9
src/main/java/emu/lunarcore/server/packet/send/PacketGetArchiveDataScRsp.java
View File

@@ -1,6 +1,9 @@
package emu.lunarcore.server.packet.send;
import java.util.stream.Collectors;
import emu.lunarcore.data.GameData;
import emu.lunarcore.data.excel.RelicExcel;
import emu.lunarcore.proto.GetArchiveDataScRspOuterClass.GetArchiveDataScRsp;
import emu.lunarcore.proto.MonsterArchiveOuterClass.MonsterArchive;
import emu.lunarcore.proto.RelicArchiveOuterClass.RelicArchive;
@@ -16,19 +19,21 @@ public class PacketGetArchiveDataScRsp extends BasePacket {
var data = GetArchiveDataScRsp.newInstance();
var archiveData = data.getMutableArchiveData();
var allRelicSetIds = GameData.getAllRelicSetIds();
//var allRelicSetIds = GameData.getRelicExcelMap().values().stream().map(RelicExcel::getSetId).collect(Collectors.toSet());
//for (var avatarExcel : GameData.getAvatarExcelMap().values()) {
//archiveData.addArchiveAvatarIdList(avatarExcel.getAvatarID());
//}
/*
for (int relicSetId : allRelicSetIds) {
int setType = GameData.getTypeValueFromSetID(relicSetId);
var relicSetInstance = RelicArchive.newInstance()
.setRelicId(relicSetId)
.setRelicId(relicSetId);
.setSlot(setType);
archiveData.addRelicList(relicSetInstance);
}
*/
for (var monsterExcel : GameData.getMonsterExcelMap().values()) {
MonsterArchive monsterinfo = MonsterArchive.newInstance()