diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/collection/CollectionSerializer.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/collection/CollectionSerializer.java index 4df27d953..2fca3dfd1 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/collection/CollectionSerializer.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/collection/CollectionSerializer.java @@ -124,7 +124,7 @@ public class CollectionSerializer { String line; while ((line = cardReader.readLine()) != null) { - if (!line.substring(0, setId.length()).equals(setId)) + if (!line.startsWith(setId)) throw new IllegalStateException("Seems the rarity is for some other set"); // Normal _singleByteCountItems.add(translateToBlueprintId(line)); diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/packs/FixedPackBox.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/packs/FixedPackBox.java index 2ca186548..3028b6854 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/packs/FixedPackBox.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/packs/FixedPackBox.java @@ -1,5 +1,6 @@ package com.gempukku.lotro.packs; +import com.gempukku.lotro.common.AppConfig; import com.gempukku.lotro.game.CardCollection; import java.io.BufferedReader; @@ -14,7 +15,7 @@ public class FixedPackBox implements PackBox { private final Map _contents = new LinkedHashMap<>(); public FixedPackBox(String packName) throws IOException { - try (BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(FixedPackBox.class.getResourceAsStream("/" + packName + ".pack")))) { + try (BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(AppConfig.getResourceStream("product/" + packName + ".pack")))) { String line; while ((line = bufferedReader.readLine()) != null) { line = line.trim();