From 9b3950f8af315c098b65a67108e51ba694ebca47 Mon Sep 17 00:00:00 2001 From: "marcin.sciesinski" Date: Fri, 9 Aug 2019 15:59:02 -0700 Subject: [PATCH] Removed getPossessionClass, using getPossessionClasses now --- .../lotro/cards/set40/isengard/Card40_132.java | 17 +++++++++-------- .../logic/cardtype/AbstractAttachable.java | 5 +++-- .../cardtype/AbstractLotroCardBlueprint.java | 12 ++++-------- 3 files changed, 16 insertions(+), 18 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set40/isengard/Card40_132.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set40/isengard/Card40_132.java index c4e370b69..9c2568862 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set40/isengard/Card40_132.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set40/isengard/Card40_132.java @@ -1,22 +1,23 @@ package com.gempukku.lotro.cards.set40.isengard; -import com.gempukku.lotro.logic.cardtype.AbstractPermanent; -import com.gempukku.lotro.logic.timing.PlayConditions; -import com.gempukku.lotro.logic.timing.TriggerConditions; -import com.gempukku.lotro.logic.effects.StackPlayedEventOnACardEffect; -import com.gempukku.lotro.logic.effects.choose.ChooseAndPutCardFromStackedToHandEffect; -import com.gempukku.lotro.logic.timing.results.PlayEventResult; import com.gempukku.lotro.common.*; import com.gempukku.lotro.filters.Filters; import com.gempukku.lotro.game.PhysicalCard; import com.gempukku.lotro.game.state.LotroGame; import com.gempukku.lotro.logic.actions.ActivateCardAction; +import com.gempukku.lotro.logic.cardtype.AbstractPermanent; import com.gempukku.lotro.logic.effects.RemoveThreatsEffect; +import com.gempukku.lotro.logic.effects.StackPlayedEventOnACardEffect; +import com.gempukku.lotro.logic.effects.choose.ChooseAndPutCardFromStackedToHandEffect; import com.gempukku.lotro.logic.timing.Action; import com.gempukku.lotro.logic.timing.EffectResult; +import com.gempukku.lotro.logic.timing.PlayConditions; +import com.gempukku.lotro.logic.timing.TriggerConditions; +import com.gempukku.lotro.logic.timing.results.PlayEventResult; import java.util.Collections; import java.util.List; +import java.util.Set; /** * Title: The Palantir of Orthanc, Corruptor of Wizards @@ -36,8 +37,8 @@ public class Card40_132 extends AbstractPermanent { } @Override - public PossessionClass getPossessionClass() { - return PossessionClass.PALANTIR; + public Set getPossessionClasses() { + return Collections.singleton(PossessionClass.PALANTIR); } @Override diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/cardtype/AbstractAttachable.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/cardtype/AbstractAttachable.java index 9a3e2c12f..5a8e13950 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/cardtype/AbstractAttachable.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/cardtype/AbstractAttachable.java @@ -22,8 +22,9 @@ public abstract class AbstractAttachable extends AbstractLotroCardBlueprint { _possessionClass = possessionClass; } - public final PossessionClass getPossessionClass() { - return _possessionClass; + @Override + public Set getPossessionClasses() { + return Collections.singleton(_possessionClass); } private Filter getFullAttachValidTargetFilter(String playerId, final LotroGame game, final PhysicalCard self) { diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/cardtype/AbstractLotroCardBlueprint.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/cardtype/AbstractLotroCardBlueprint.java index af6e15466..8b8daf137 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/cardtype/AbstractLotroCardBlueprint.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/cardtype/AbstractLotroCardBlueprint.java @@ -13,7 +13,10 @@ import com.gempukku.lotro.logic.timing.Effect; import com.gempukku.lotro.logic.timing.EffectResult; import com.gempukku.lotro.logic.timing.PlayConditions; -import java.util.*; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; public abstract class AbstractLotroCardBlueprint implements LotroCardBlueprint { private int _twilightCost; @@ -187,13 +190,6 @@ public abstract class AbstractLotroCardBlueprint implements LotroCardBlueprint { @Override public Set getPossessionClasses() { - final PossessionClass possessionClass = getPossessionClass(); - if (possessionClass != null) - return Collections.singleton(possessionClass); - return null; - } - - public PossessionClass getPossessionClass() { return null; }