From f1f5b729cf19aa35828aba6cbc47f1405a705436 Mon Sep 17 00:00:00 2001 From: "marcin.sciesinski" Date: Tue, 27 Aug 2019 12:53:23 -0700 Subject: [PATCH] Fixing issues with attachment cards being tested with instanceof --- .../effects/choose/ChooseAndTransferAttachableEffect.java | 5 +---- .../java/com/gempukku/lotro/logic/timing/ExtraFilters.java | 3 +-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/choose/ChooseAndTransferAttachableEffect.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/choose/ChooseAndTransferAttachableEffect.java index b83978f29..9b6902658 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/choose/ChooseAndTransferAttachableEffect.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/choose/ChooseAndTransferAttachableEffect.java @@ -4,14 +4,11 @@ import com.gempukku.lotro.common.Filterable; import com.gempukku.lotro.filters.Filter; import com.gempukku.lotro.filters.Filters; import com.gempukku.lotro.game.PhysicalCard; -import com.gempukku.lotro.game.state.GameState; import com.gempukku.lotro.game.state.LotroGame; import com.gempukku.lotro.logic.actions.SubAction; -import com.gempukku.lotro.logic.cardtype.AbstractAttachable; import com.gempukku.lotro.logic.decisions.CardsSelectionDecision; import com.gempukku.lotro.logic.decisions.DecisionResultInvalidException; import com.gempukku.lotro.logic.effects.TransferPermanentEffect; -import com.gempukku.lotro.logic.modifiers.ModifiersQuerying; import com.gempukku.lotro.logic.timing.AbstractEffect; import com.gempukku.lotro.logic.timing.Action; import com.gempukku.lotro.logic.timing.RuleUtils; @@ -82,7 +79,7 @@ public class ChooseAndTransferAttachableEffect extends AbstractEffect { new Filter() { @Override public boolean accepts(LotroGame game, final PhysicalCard transferredCard) { - if (!(transferredCard.getBlueprint() instanceof AbstractAttachable)) + if (transferredCard.getBlueprint().getValidTargetFilter(transferredCard.getOwner(), game, transferredCard) == null) return false; if (!game.getModifiersQuerying().canBeTransferred(game, transferredCard)) diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/ExtraFilters.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/ExtraFilters.java index f62a30dbd..97b8e6a76 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/ExtraFilters.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/ExtraFilters.java @@ -6,7 +6,6 @@ import com.gempukku.lotro.filters.Filters; import com.gempukku.lotro.game.PhysicalCard; import com.gempukku.lotro.game.state.LotroGame; import com.gempukku.lotro.logic.PlayUtils; -import com.gempukku.lotro.logic.cardtype.AbstractAttachable; public class ExtraFilters { public static Filter attachableTo(final LotroGame game, final Filterable... filters) { @@ -18,7 +17,7 @@ public class ExtraFilters { new Filter() { @Override public boolean accepts(LotroGame game, PhysicalCard physicalCard) { - if (!(physicalCard.getBlueprint() instanceof AbstractAttachable)) + if (physicalCard.getBlueprint().getValidTargetFilter(physicalCard.getOwner(), game, physicalCard) == null) return false; return PlayUtils.checkPlayRequirements(game, physicalCard, Filters.and(filters), 0, twilightModifier, false, false); }