diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/CardCollection.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/CardCollection.java index ddf514ad7..cfdee5484 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/CardCollection.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/CardCollection.java @@ -2,7 +2,7 @@ package com.gempukku.lotro.game; import java.util.Map; -public interface CardCollection extends OwnershipCheck { +public interface CardCollection { int getCurrency(); Iterable getAll(); diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/OwnershipCheck.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/OwnershipCheck.java deleted file mode 100644 index 0a5132934..000000000 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/OwnershipCheck.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.gempukku.lotro.game; - -public interface OwnershipCheck { - public int getItemCount(String blueprintId); -} diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java index ab96cb0f0..5009bdb68 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java @@ -620,9 +620,7 @@ public class HallServer extends AbstractServer { String blueprintId = cardCount.getKey(); int count = cardCount.getValue(); - int owned = 0; - if (ownedCollection != null) - owned = ownedCollection.getItemCount(blueprintId); + int owned = ownedCollection.getItemCount(blueprintId); int fromOwned = Math.min(owned, count); for (int i = 0; i < fromOwned; i++) diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/MergedOwnershipCheck.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/MergedOwnershipCheck.java deleted file mode 100644 index ac343cc81..000000000 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/MergedOwnershipCheck.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.gempukku.lotro.hall; - -import com.gempukku.lotro.game.OwnershipCheck; - -public class MergedOwnershipCheck implements OwnershipCheck { - private OwnershipCheck[] _ownershipChecks; - - public MergedOwnershipCheck(OwnershipCheck... ownershipChecks) { - _ownershipChecks = ownershipChecks; - } - - @Override - public int getItemCount(String blueprintId) { - int count = 0; - for (OwnershipCheck ownershipCheck : _ownershipChecks) - count += ownershipCheck.getItemCount(blueprintId); - return count; - } -}