From 1c447dc2120a3f6df52478ce0d0b2a50e963cb48 Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Sat, 2 Jun 2018 20:27:18 -0400 Subject: [PATCH] Check allies have same home site to allow transfers Courtesy of Tbiesty! --- .../lotro/cards/AbstractAttachableFPPossession.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAttachableFPPossession.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAttachableFPPossession.java index a17cb527d..a1e7ad095 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAttachableFPPossession.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAttachableFPPossession.java @@ -44,7 +44,8 @@ public abstract class AbstractAttachableFPPossession extends AbstractAttachable Filter validTransferFilter; - LotroCardBlueprint attachedTo = self.getAttachedTo().getBlueprint(); + PhysicalCard attachedToCard = self.getAttachedTo(); + LotroCardBlueprint attachedTo = attachedToCard.getBlueprint(); if (attachedTo.getCardType() == CardType.COMPANION) { validTransferFilter = Filters.and(validTargetFilter, Filters.or( @@ -54,11 +55,10 @@ public abstract class AbstractAttachableFPPossession extends AbstractAttachable validTransferFilter = Filters.and(validTargetFilter, Filters.or( CardType.COMPANION, - Filters.allyAtHome)); + Filters.allyWithSameHome(attachedToCard))); } else { validTransferFilter = Filters.and(validTargetFilter, - CardType.ALLY, Filters.allyAtHome - ); + Filters.allyWithSameHome(attachedToCard)); } validTransferFilter = Filters.and(validTransferFilter,