diff --git a/src/main/java/forge/card/cost/CostExile.java b/src/main/java/forge/card/cost/CostExile.java index fac07f9b675..4cbed1e2b3e 100644 --- a/src/main/java/forge/card/cost/CostExile.java +++ b/src/main/java/forge/card/cost/CostExile.java @@ -453,7 +453,7 @@ public class CostExile extends CostPartWithList { */ @Override protected void doPayment(SpellAbility ability, Card targetCard) { - ability.getActivatingPlayer().getGame().getAction().exile(targetCard); + targetCard.getGame().getAction().exile(targetCard); } /* (non-Javadoc) diff --git a/src/main/java/forge/card/cost/CostExileAndPay.java b/src/main/java/forge/card/cost/CostExileAndPay.java index 676fb34e408..a27e893d6a0 100644 --- a/src/main/java/forge/card/cost/CostExileAndPay.java +++ b/src/main/java/forge/card/cost/CostExileAndPay.java @@ -25,7 +25,7 @@ public class CostExileAndPay extends CostPartWithList { */ @Override protected void doPayment(SpellAbility ability, Card targetCard) { - ability.getActivatingPlayer().getGame().getAction().exile(targetCard); + targetCard.getGame().getAction().exile(targetCard); } /* (non-Javadoc) diff --git a/src/main/java/forge/card/cost/CostExiledMoveToGrave.java b/src/main/java/forge/card/cost/CostExiledMoveToGrave.java index 5950df71427..36c41733a09 100644 --- a/src/main/java/forge/card/cost/CostExiledMoveToGrave.java +++ b/src/main/java/forge/card/cost/CostExiledMoveToGrave.java @@ -153,7 +153,7 @@ public class CostExiledMoveToGrave extends CostPartWithList { */ @Override protected void doPayment(SpellAbility ability, Card targetCard) { - ability.getActivatingPlayer().getGame().getAction().moveToGraveyard(targetCard); + targetCard.getGame().getAction().moveToGraveyard(targetCard); } /* (non-Javadoc) diff --git a/src/main/java/forge/card/cost/CostMill.java b/src/main/java/forge/card/cost/CostMill.java index e831f44502e..91941b9ecdc 100644 --- a/src/main/java/forge/card/cost/CostMill.java +++ b/src/main/java/forge/card/cost/CostMill.java @@ -148,7 +148,7 @@ public class CostMill extends CostPartWithList { */ @Override protected void doPayment(SpellAbility ability, Card targetCard) { - ability.getActivatingPlayer().getGame().getAction().moveToGraveyard(targetCard); + targetCard.getGame().getAction().moveToGraveyard(targetCard); } /* (non-Javadoc) diff --git a/src/main/java/forge/card/cost/CostPutCardToLib.java b/src/main/java/forge/card/cost/CostPutCardToLib.java index 9d4bd2a26a4..20eeeae0828 100644 --- a/src/main/java/forge/card/cost/CostPutCardToLib.java +++ b/src/main/java/forge/card/cost/CostPutCardToLib.java @@ -319,7 +319,7 @@ public class CostPutCardToLib extends CostPartWithList { */ @Override protected void doPayment(SpellAbility ability, Card targetCard) { - ability.getActivatingPlayer().getGame().getAction().moveToLibrary(targetCard, Integer.parseInt(getLibPos())); + targetCard.getGame().getAction().moveToLibrary(targetCard, Integer.parseInt(getLibPos())); } /* (non-Javadoc) diff --git a/src/main/java/forge/card/cost/CostReturn.java b/src/main/java/forge/card/cost/CostReturn.java index d8e033175e0..2112b13d14a 100644 --- a/src/main/java/forge/card/cost/CostReturn.java +++ b/src/main/java/forge/card/cost/CostReturn.java @@ -186,7 +186,7 @@ public class CostReturn extends CostPartWithList { */ @Override protected void doPayment(SpellAbility ability, Card targetCard) { - ability.getActivatingPlayer().getGame().getAction().moveToHand(targetCard); + targetCard.getGame().getAction().moveToHand(targetCard); } /* (non-Javadoc) diff --git a/src/main/java/forge/card/cost/CostReveal.java b/src/main/java/forge/card/cost/CostReveal.java index 4ba82400535..c12ca771d6d 100644 --- a/src/main/java/forge/card/cost/CostReveal.java +++ b/src/main/java/forge/card/cost/CostReveal.java @@ -215,7 +215,7 @@ public class CostReveal extends CostPartWithList { */ @Override protected void doPayment(SpellAbility ability, Card targetCard) { - ability.getActivatingPlayer().getGame().getAction().reveal(Lists.newArrayList(targetCard), ability.getActivatingPlayer()); + targetCard.getGame().getAction().reveal(Lists.newArrayList(targetCard), ability.getActivatingPlayer()); } diff --git a/src/main/java/forge/card/cost/CostSacrifice.java b/src/main/java/forge/card/cost/CostSacrifice.java index 4566a64d71d..f28bb6fd7d4 100644 --- a/src/main/java/forge/card/cost/CostSacrifice.java +++ b/src/main/java/forge/card/cost/CostSacrifice.java @@ -175,7 +175,7 @@ public class CostSacrifice extends CostPartWithList { @Override protected void doPayment(SpellAbility ability, Card targetCard) { - ability.getActivatingPlayer().getGame().getAction().sacrifice(targetCard, ability); + targetCard.getGame().getAction().sacrifice(targetCard, ability); } /* (non-Javadoc)