From 6c924edd7a2f7688c05a5bdf528ee31c34782816 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Sun, 23 Mar 2014 19:49:11 +0100
Subject: [PATCH] * Variable loyality payment - Fixed a bug that the -X payment
 of loyality counters was added insted subtracted. Prevented the possibility
 to announce x loyality counter payment, if already one planeswalker ability
 was used this turn.

---
 .../src/mage/sets/theros/AshiokNightmareWeaver.java    |  7 ++++---
 .../mage/abilities/costs/common/PayLoyaltyCost.java    | 10 +++++-----
 .../abilities/costs/common/PayVariableLoyaltyCost.java |  9 ++++++++-
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/theros/AshiokNightmareWeaver.java b/Mage.Sets/src/mage/sets/theros/AshiokNightmareWeaver.java
index 4d66891eea..46984f0458 100644
--- a/Mage.Sets/src/mage/sets/theros/AshiokNightmareWeaver.java
+++ b/Mage.Sets/src/mage/sets/theros/AshiokNightmareWeaver.java
@@ -120,11 +120,12 @@ class AshiokNightmareWeaverExileEffect extends OneShotEffect<AshiokNightmareWeav
     public boolean apply(Game game, Ability source) {
         UUID exileId = CardUtil.getCardExileZoneId(game, source);
         Player opponent = game.getPlayer(this.getTargetPointer().getFirst(game, source));
-        if (opponent != null) {
+        Player controller = game.getPlayer(source.getSourceId());
+        if (opponent != null && controller != null) {
             for (int i = 0; i < 3; i++) {
                 Card card = opponent.getLibrary().getFromTop(game);
                 if (card != null) {
-                    card.moveToExile(exileId, "Ashiok, Nightmare Weaver", source.getSourceId(), game);
+                    controller.moveCardToExileWithInfo(card, exileId, "Ashiok, Nightmare Weaver", source.getSourceId(), game, Zone.HAND);
                 }
             }
         }
@@ -170,7 +171,7 @@ class AshiokNightmareWeaverPutIntoPlayEffect extends OneShotEffect<AshiokNightma
         if (target.canChoose(source.getSourceId(), player.getId(), game)) {
             if (player.chooseTarget(Outcome.PutCreatureInPlay, target, source, game)) {
                 Card card = game.getCard(target.getFirstTarget());
-                if (card != null && card.putOntoBattlefield(game, Zone.EXILED, source.getSourceId(), player.getId())) {
+                if (card != null && player.putOntoBattlefieldWithInfo(card, game, Zone.EXILED, source.getSourceId())) {
                     ContinuousEffectImpl effect = new AshiokNightmareWeaverAddTypeEffect();
                     effect.setTargetPointer(new FixedTarget(card.getId()));
                     game.addEffect(effect, source);
diff --git a/Mage/src/mage/abilities/costs/common/PayLoyaltyCost.java b/Mage/src/mage/abilities/costs/common/PayLoyaltyCost.java
index 13a060aacf..4cf0a1cc5b 100644
--- a/Mage/src/mage/abilities/costs/common/PayLoyaltyCost.java
+++ b/Mage/src/mage/abilities/costs/common/PayLoyaltyCost.java
@@ -42,12 +42,14 @@ import mage.game.permanent.Permanent;
  */
 public class PayLoyaltyCost extends CostImpl<PayLoyaltyCost> {
 
-    private int amount;
+    private final int amount;
 
     public PayLoyaltyCost(int amount) {
         this.amount = amount;
         this.text = Integer.toString(amount);
-        if (amount >= 0) this.text = "+" + this.text;
+        if (amount >= 0) {
+            this.text = "+" + this.text;
+        }
     }
 
     public PayLoyaltyCost(PayLoyaltyCost cost) {
@@ -58,9 +60,7 @@ public class PayLoyaltyCost extends CostImpl<PayLoyaltyCost> {
     @Override
     public boolean canPay(UUID sourceId, UUID controllerId, Game game) {
         Permanent planeswalker = game.getPermanent(sourceId);
-        if (planeswalker.getCounters().getCount(CounterType.LOYALTY) + amount >= 0 && !planeswalker.isLoyaltyUsed())
-            return true;
-        return false;
+        return planeswalker.getCounters().getCount(CounterType.LOYALTY) + amount >= 0 && !planeswalker.isLoyaltyUsed();
     }
 
     @Override
diff --git a/Mage/src/mage/abilities/costs/common/PayVariableLoyaltyCost.java b/Mage/src/mage/abilities/costs/common/PayVariableLoyaltyCost.java
index c74f3cc703..ac2ae09072 100644
--- a/Mage/src/mage/abilities/costs/common/PayVariableLoyaltyCost.java
+++ b/Mage/src/mage/abilities/costs/common/PayVariableLoyaltyCost.java
@@ -28,6 +28,7 @@
 
 package mage.abilities.costs.common;
 
+import java.util.UUID;
 import mage.abilities.Ability;
 import mage.abilities.costs.Cost;
 import mage.abilities.costs.VariableCostImpl;
@@ -55,9 +56,15 @@ public class PayVariableLoyaltyCost extends VariableCostImpl<PayVariableLoyaltyC
         return new PayVariableLoyaltyCost(this);
     }
     
+    @Override
+    public boolean canPay(UUID sourceId, UUID controllerId, Game game) {
+        Permanent planeswalker = game.getPermanent(sourceId);
+        return planeswalker!= null && !planeswalker.isLoyaltyUsed();
+    }
+
     @Override
     public Cost getFixedCostsFromAnnouncedValue(int xValue) {
-        return new PayLoyaltyCost(xValue);
+        return new PayLoyaltyCost(-xValue);
     }
 
     @Override