ambidextrous/gemp-lotr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing issues with attachment cards being tested with instanceof

Browse Source
This commit is contained in:
marcin.sciesinski
2019-08-27 12:53:23 -07:00
parent 33ce5436a5
commit f1f5b729cf
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/choose/ChooseAndTransferAttachableEffect.java
View File

@@ -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))

3
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/ExtraFilters.java
View File

@@ -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);
}